diff options
| author | Dees_Troy <dees_troy@teamw.in> | 2013-08-17 15:14:43 +0200 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@198.50.184.117> | 2013-08-24 14:42:30 +0200 |
| commit | a95f55c3ef657411f92c0c00a2e23ceb1d52b851 (patch) | |
| tree | ca5c779bea6a16f5e1b397c59de80058fe9b7bb0 /Android.mk | |
| parent | Merge "Fix AOSP decrypt when TouchWiz code is present" into twrp2.5 (diff) | |
| download | android_bootable_recovery-a95f55c3ef657411f92c0c00a2e23ceb1d52b851.tar android_bootable_recovery-a95f55c3ef657411f92c0c00a2e23ceb1d52b851.tar.gz android_bootable_recovery-a95f55c3ef657411f92c0c00a2e23ceb1d52b851.tar.bz2 android_bootable_recovery-a95f55c3ef657411f92c0c00a2e23ceb1d52b851.tar.lz android_bootable_recovery-a95f55c3ef657411f92c0c00a2e23ceb1d52b851.tar.xz android_bootable_recovery-a95f55c3ef657411f92c0c00a2e23ceb1d52b851.tar.zst android_bootable_recovery-a95f55c3ef657411f92c0c00a2e23ceb1d52b851.zip | |
Diffstat (limited to '')
| -rw-r--r-- | Android.mk | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk index da06b9a60..a6a82ef26 100644 --- a/Android.mk +++ b/Android.mk @@ -56,7 +56,7 @@ LOCAL_STATIC_LIBRARIES := LOCAL_SHARED_LIBRARIES := LOCAL_STATIC_LIBRARIES += libcrecovery libguitwrp -LOCAL_SHARED_LIBRARIES += libz libc libstlport libcutils libstdc++ libext4_utils libtar libblkid libminuitwrp libminadbd libmtdutils libminzip libaosprecovery +LOCAL_SHARED_LIBRARIES += libz libc libstlport libcutils libstdc++ libtar libblkid libminuitwrp libminadbd libmtdutils libminzip libaosprecovery ifneq ($(wildcard system/core/libsparse/Android.mk),) LOCAL_SHARED_LIBRARIES += libsparse @@ -65,9 +65,9 @@ endif ifeq ($(TARGET_USERIMAGES_USE_EXT4), true) LOCAL_CFLAGS += -DUSE_EXT4 LOCAL_C_INCLUDES += system/extras/ext4_utils - #LOCAL_STATIC_LIBRARIES += libext4_utils + LOCAL_SHARED_LIBRARIES += libext4_utils endif - +LOCAL_C_INCLUDES += external/libselinux/include ifeq ($(HAVE_SELINUX), true) #LOCAL_C_INCLUDES += external/libselinux/include #LOCAL_STATIC_LIBRARIES += libselinux @@ -75,8 +75,13 @@ ifeq ($(HAVE_SELINUX), true) endif # HAVE_SELINUX ifneq ($(wildcard external/libselinux/Android.mk),) LOCAL_C_INCLUDES += external/libselinux/include - LOCAL_STATIC_LIBRARIES += libselinux + LOCAL_SHARED_LIBRARIES += libselinux LOCAL_CFLAGS += -DHAVE_SELINUX -g + ifneq ($(TARGET_USERIMAGES_USE_EXT4), true) + LOCAL_CFLAGS += -DUSE_EXT4 + LOCAL_C_INCLUDES += system/extras/ext4_utils + LOCAL_SHARED_LIBRARIES += libext4_utils + endif endif # This binary is in the recovery ramdisk, which is otherwise a copy of root. |