Merge "base: adb.exe build error"
diff --git a/init/builtins.cpp b/init/builtins.cpp
index 7cbb7a0..be259c2 100644
--- a/init/builtins.cpp
+++ b/init/builtins.cpp
@@ -1032,6 +1032,10 @@
{"load_system_props", {0, 0, {false, do_load_system_props}}},
{"loglevel", {1, 1, {false, do_loglevel}}},
{"mkdir", {1, 4, {true, do_mkdir}}},
+ // TODO: Do mount operations in vendor_init.
+ // mount_all is currently too complex to run in vendor_init as it queues action triggers,
+ // imports rc scripts, etc. It should be simplified and run in vendor_init context.
+ // mount and umount are run in the same context as mount_all for symmetry.
{"mount_all", {1, kMax, {false, do_mount_all}}},
{"mount", {3, kMax, {false, do_mount}}},
{"umount", {1, 1, {false, do_umount}}},
diff --git a/libcutils/include/private/android_filesystem_config.h b/libcutils/include/private/android_filesystem_config.h
index fc354f1..5d17698 100644
--- a/libcutils/include/private/android_filesystem_config.h
+++ b/libcutils/include/private/android_filesystem_config.h
@@ -55,6 +55,9 @@
*/
#define AID_ROOT 0 /* traditional unix root user */
+/* The following are for LTP and should only be used for testing */
+#define AID_DAEMON 1 /* traditional unix daemon owner */
+#define AID_BIN 2 /* traditional unix binaries owner */
#define AID_SYSTEM 1000 /* system server */