commit 3b9c83a0f69778253f82730404363b5f5f795eb2
author Jeff Sharkey <jsharkey@android.com> Wed Feb 03 14:44:44 2016 -0700
committer Jeff Sharkey <jsharkey@android.com> Thu Feb 04 15:26:23 2016 -0700
tree 8543258da5ddc7173e82a0641fa5002508e0860b
parent 2c98e128c5a5c94969174b2385692ad93a42a293

User 0 directories are created by vold now.

This ensures that all users on device follow a consistent path for
setup and validation of encryption policy.

Also add remaining user-specific directories and fix linking order.

Bug: 25796509
Change-Id: I8c2e42a78569817f7f5ea03f54b743a6661fdb9c

init/Android.mk

diff --git a/init/Android.mk b/init/Android.mk
index 66ce8a8..d8b574f 100644
--- a/init/Android.mk
+++ b/init/Android.mk
@@ -89,8 +89,8 @@
     libsquashfs_utils \
     liblogwrap \
     libcutils \
-    libbase \
     libext4_utils_static \
+    libbase \
     libutils \
     libc \
     libselinux \

init/builtins.cpp

diff --git a/init/builtins.cpp b/init/builtins.cpp
index 210ce4a..229487f 100644
--- a/init/builtins.cpp
+++ b/init/builtins.cpp
@@ -878,9 +878,6 @@
 }
 
 static int do_init_user0(const std::vector<std::string>& args) {
-    if (!is_file_crypto()) {
-        return 0;
-    }
     return e4crypt_do_init_user0();
 }