diff options
| -rw-r--r-- | crypto/lollipop/Android.mk | 43 | ||||
| -rw-r--r-- | prebuilt/Android.mk | 3 |
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 |