diff options
| author | Paul Lawrence <paullawrence@google.com> | 2015-03-26 15:49:42 +0000 |
|---|---|---|
| committer | Paul Lawrence <paullawrence@google.com> | 2015-03-31 13:02:13 -0700 |
| commit | b8c9d273a07f3fc45780e763bb3f7f6266b8cab7 (patch) | |
| tree | 0f3f3070a9f3e447393e97116917348b1d9aa49d /init/Android.mk | |
| parent | 934102baf8fca57abf63df7f134e977e696722db (diff) | |
| download | system_core-b8c9d273a07f3fc45780e763bb3f7f6266b8cab7.zip system_core-b8c9d273a07f3fc45780e763bb3f7f6266b8cab7.tar.gz system_core-b8c9d273a07f3fc45780e763bb3f7f6266b8cab7.tar.bz2 | |
Revert "Revert "Adding e4crypt support""
Fix build break caused by original change
This reverts commit 84b0bab58fcc7f225e9a17a15c531b0c2fc509c5.
Change-Id: I99fbd7c3d1ed92db1f546033c8493bb71a327924
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 cb4cb11..dd867cb 100644 --- a/init/Android.mk +++ b/init/Android.mk @@ -47,7 +47,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) @@ -58,11 +58,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; \ |