commit b7490df324e8ff37950ee4f03eb233b7e21bb738
author TreeHugger Robot <treehugger-gerrit@google.com> Wed May 24 03:47:08 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 24 03:47:09 2017 +0000
tree c5eb566b2d5bdb5d3778f75126a70b54cfca2229
parent c60259359f87eb3df81382b917ad334fda0b7431
parent 6e48d5bb610f0c024c391bd7475f1f6248183e2b

Merge "Always print the initial bugreport progress message." into oc-dev

libcutils/fs_config.c

diff --git a/libcutils/fs_config.c b/libcutils/fs_config.c
index 17d7cb9..d98a923 100644
--- a/libcutils/fs_config.c
+++ b/libcutils/fs_config.c
@@ -214,6 +214,9 @@
     /* Support wifi_hal_legacy administering a network interface. */
     { 00755, AID_WIFI,      AID_WIFI,      CAP_MASK_LONG(CAP_NET_ADMIN) |
                                            CAP_MASK_LONG(CAP_NET_RAW),
+                                              "system/vendor/bin/hw/android.hardware.wifi@1.0-service" },
+    { 00755, AID_WIFI,      AID_WIFI,      CAP_MASK_LONG(CAP_NET_ADMIN) |
+                                           CAP_MASK_LONG(CAP_NET_RAW),
                                               "vendor/bin/hw/android.hardware.wifi@1.0-service" },
 
     /* A non-privileged zygote that spawns

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index 944aae7..3b996a4 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -7,6 +7,7 @@
 import /init.environ.rc
 import /init.usb.rc
 import /init.${ro.hardware}.rc
+import /vendor/etc/init/hw/init.${ro.hardware}.rc
 import /init.usb.configfs.rc
 import /init.${ro.zygote}.rc
 

shell_and_utilities/Android.bp

diff --git a/shell_and_utilities/Android.bp b/shell_and_utilities/Android.bp
new file mode 100644
index 0000000..4f4fc5d
--- /dev/null
+++ b/shell_and_utilities/Android.bp
@@ -0,0 +1,16 @@
+phony {
+    name: "shell_and_utilities",
+    required: [
+        "bzip2",
+        "grep",
+        "gzip",
+        "mkshrc",
+        "mkshrc_vendor",
+        "reboot",
+        "sh",
+        "sh_vendor",
+        "toolbox",
+        "toybox",
+        "toybox_vendor",
+    ],
+}