summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthat <github@that.at>2014-12-31 18:30:50 +0100
committerDees Troy <dees_troy@teamw.in>2015-01-05 03:14:28 +0100
commit183a6f88d05097428c81bca571a679f2ec9292c3 (patch)
tree7afe10cba91dbe17f0bdcae2c9dc08d9574a6b80
parentFix adb sideload during ORS (diff)
downloadandroid_bootable_recovery-183a6f88d05097428c81bca571a679f2ec9292c3.tar
android_bootable_recovery-183a6f88d05097428c81bca571a679f2ec9292c3.tar.gz
android_bootable_recovery-183a6f88d05097428c81bca571a679f2ec9292c3.tar.bz2
android_bootable_recovery-183a6f88d05097428c81bca571a679f2ec9292c3.tar.lz
android_bootable_recovery-183a6f88d05097428c81bca571a679f2ec9292c3.tar.xz
android_bootable_recovery-183a6f88d05097428c81bca571a679f2ec9292c3.tar.zst
android_bootable_recovery-183a6f88d05097428c81bca571a679f2ec9292c3.zip
-rw-r--r--crypto/lollipop/Android.mk43
-rw-r--r--prebuilt/Android.mk3
2 files changed, 2 insertions, 44 deletions
diff --git a/crypto/lollipop/Android.mk b/crypto/lollipop/Android.mk
index d263a9f32..148e328da 100644
--- a/crypto/lollipop/Android.mk
+++ b/crypto/lollipop/Android.mk
@@ -2,51 +2,12 @@ LOCAL_PATH := $(call my-dir)
ifeq ($(TW_INCLUDE_CRYPTO), true)
include $(CLEAR_VARS)
-common_c_includes := \
- system/extras/ext4_utils \
- system/extras/f2fs_utils \
- external/openssl/include \
- external/stlport/stlport \
- bionic \
- $(commands_recovery_local_path)/crypto/scrypt/lib/crypto \
- frameworks/native/include \
- system/security/keystore \
- hardware/libhardware/include/hardware \
- system/security/softkeymaster/include/keymaster
-
-common_shared_libraries := \
- libsysutils \
- libstlport \
- libbinder \
- libcutils \
- liblog \
- libdiskconfig \
- liblogwrap \
- libext4_utils \
- libf2fs_sparseblock \
- libcrypto \
- libselinux \
- libutils \
- libminhardware \
- libsoftkeymaster
-
-common_shared_libraries := libcrypto libselinux libhardware libsoftkeymaster libcutils
-
LOCAL_MODULE := libcryptfslollipop
LOCAL_MODULE_TAGS := eng optional
LOCAL_CFLAGS :=
LOCAL_SRC_FILES = cryptfs.c
-#LOCAL_C_INCLUDES += \
-# system/extras/ext4_utils \
-# external/openssl/include \
-# system/extras/f2fs_utils \
-# external/scrypt/lib/crypto \
-# system/security/keystore \
-# hardware/libhardware/include/hardware \
-# system/security/softkeymaster/include/keymaster
-#LOCAL_SHARED_LIBRARIES += libc liblog libcutils libcrypto libext4_utils
-LOCAL_SHARED_LIBRARIES := $(common_shared_libraries) libmincrypttwrp
-LOCAL_C_INCLUDES := external/openssl/include $(common_c_includes)
+LOCAL_SHARED_LIBRARIES := libcrypto libhardware libcutils
+LOCAL_C_INCLUDES := external/openssl/include $(commands_recovery_local_path)/crypto/scrypt/lib/crypto
LOCAL_WHOLE_STATIC_LIBRARIES += libscrypttwrp_static
include $(BUILD_SHARED_LIBRARY)
diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk
index 6d9f12f71..d8ed87c81 100644
--- a/prebuilt/Android.mk
+++ b/prebuilt/Android.mk
@@ -117,10 +117,7 @@ endif
ifeq ($(TW_INCLUDE_CRYPTO), true)
RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libcryptfslollipop.so
RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libcrypto.so
- RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libbinder.so
RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libhardware.so
- RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libsoftkeymaster.so
- RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libkeystore_binder.so
endif
ifeq ($(TARGET_USERIMAGES_USE_EXT4), true)
RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/make_ext4fs