diff options
| author | Jeff Sharkey <jsharkey@google.com> | 2016-02-05 21:01:19 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-02-05 21:01:21 +0000 |
| commit | c895f11cf1c08ffc03234bc0a5c6b2cebda15ae3 (patch) | |
| tree | 7641c52bb52471fa16abe620905a48c7ad670822 /init | |
| parent | be4948481068ad6f2014f3efb6cf59dfa4270487 (diff) | |
| parent | 3b9c83a0f69778253f82730404363b5f5f795eb2 (diff) | |
| download | core-c895f11cf1c08ffc03234bc0a5c6b2cebda15ae3.tar.gz core-c895f11cf1c08ffc03234bc0a5c6b2cebda15ae3.tar.bz2 core-c895f11cf1c08ffc03234bc0a5c6b2cebda15ae3.zip | |
Merge "User 0 directories are created by vold now."
Diffstat (limited to 'init')
| -rw-r--r-- | init/Android.mk | 2 | ||||
| -rw-r--r-- | init/builtins.cpp | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/init/Android.mk b/init/Android.mk index 66ce8a811..d8b574f2a 100644 --- a/init/Android.mk +++ b/init/Android.mk @@ -89,8 +89,8 @@ LOCAL_STATIC_LIBRARIES := \ libsquashfs_utils \ liblogwrap \ libcutils \ - libbase \ libext4_utils_static \ + libbase \ libutils \ libc \ libselinux \ diff --git a/init/builtins.cpp b/init/builtins.cpp index 210ce4ad3..229487fe7 100644 --- a/init/builtins.cpp +++ b/init/builtins.cpp @@ -878,9 +878,6 @@ static int do_installkey(const std::vector<std::string>& args) { } static int do_init_user0(const std::vector<std::string>& args) { - if (!is_file_crypto()) { - return 0; - } return e4crypt_do_init_user0(); } |