diff options
author | Paul Lawrence <paullawrence@google.com> | 2015-04-01 17:40:38 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-04-01 17:40:38 +0000 |
commit | 27cda9a535c80470e913156e412cbf7e60c3217c (patch) | |
tree | 85c041ca064a76a0a7c0527f938967273a44218f /init/Android.mk | |
parent | 6900d34ed8949b67b8bac36f91f062b90ad847dd (diff) | |
parent | b8c9d273a07f3fc45780e763bb3f7f6266b8cab7 (diff) | |
download | system_core-27cda9a535c80470e913156e412cbf7e60c3217c.zip system_core-27cda9a535c80470e913156e412cbf7e60c3217c.tar.gz system_core-27cda9a535c80470e913156e412cbf7e60c3217c.tar.bz2 |
Merge "Revert "Revert "Adding e4crypt support"""
Diffstat (limited to 'init/Android.mk')
-rw-r--r-- | init/Android.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/init/Android.mk b/init/Android.mk index 94d3dad..9d91a3f 100644 --- a/init/Android.mk +++ b/init/Android.mk @@ -50,7 +50,7 @@ LOCAL_SRC_FILES:= \ watchdogd.cpp \ LOCAL_MODULE:= init - +LOCAL_C_INCLUDES += system/extras/ext4_utils LOCAL_FORCE_STATIC_EXECUTABLE := true LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) LOCAL_UNSTRIPPED_PATH := $(TARGET_ROOT_OUT_UNSTRIPPED) @@ -61,11 +61,14 @@ LOCAL_STATIC_LIBRARIES := \ liblogwrap \ libcutils \ libbase \ + libext4_utils_static \ + libutils \ liblog \ libc \ libselinux \ libmincrypt \ - libext4_utils_static + libc++_static \ + libdl # Create symlinks LOCAL_POST_INSTALL_CMD := $(hide) mkdir -p $(TARGET_ROOT_OUT)/sbin; \ |