diff options
| author | Dees Troy <dees_troy@teamw.in> | 2014-12-12 19:50:07 +0100 |
|---|---|---|
| committer | Dees Troy <dees_troy@teamw.in> | 2014-12-12 19:50:11 +0100 |
| commit | 87da4245566acfe067efd156287b0f4e613b93e9 (patch) | |
| tree | 5f64b52153f1ca840b933808ce9e8c7bf16158df | |
| parent | Fix compiling of dosfstools for arm64 (diff) | |
| download | android_bootable_recovery-87da4245566acfe067efd156287b0f4e613b93e9.tar android_bootable_recovery-87da4245566acfe067efd156287b0f4e613b93e9.tar.gz android_bootable_recovery-87da4245566acfe067efd156287b0f4e613b93e9.tar.bz2 android_bootable_recovery-87da4245566acfe067efd156287b0f4e613b93e9.tar.lz android_bootable_recovery-87da4245566acfe067efd156287b0f4e613b93e9.tar.xz android_bootable_recovery-87da4245566acfe067efd156287b0f4e613b93e9.tar.zst android_bootable_recovery-87da4245566acfe067efd156287b0f4e613b93e9.zip | |
| -rw-r--r-- | crypto/lollipop/Android.mk | 18 | ||||
| -rw-r--r-- | crypto/scrypt/Scrypt.mk | 2 | ||||
| -rw-r--r-- | crypto/scrypt/tests/Android.mk | 1 |
3 files changed, 3 insertions, 18 deletions
diff --git a/crypto/lollipop/Android.mk b/crypto/lollipop/Android.mk index fb9860917..c98d42875 100644 --- a/crypto/lollipop/Android.mk +++ b/crypto/lollipop/Android.mk @@ -8,7 +8,7 @@ common_c_includes := \ external/openssl/include \ external/stlport/stlport \ bionic \ - external/scrypt/lib/crypto \ + bootable/recovery/crypto/scrypt/lib/crypto \ frameworks/native/include \ system/security/keystore \ hardware/libhardware/include/hardware \ @@ -51,20 +51,4 @@ LOCAL_WHOLE_STATIC_LIBRARIES += libscrypttwrp_static include $(BUILD_SHARED_LIBRARY) -include $(CLEAR_VARS) - -LOCAL_SHARED_LIBRARIES := libcutils liblog - -LOCAL_INCLUDES += $(LOCAL_PATH) $(LOCAL_PATH)\libminhardware - -LOCAL_CFLAGS += -DQEMU_HARDWARE -QEMU_HARDWARE := true - -LOCAL_SHARED_LIBRARIES += libdl - -LOCAL_SRC_FILES += libminhardware/hardware.c - -LOCAL_MODULE:= libminhardware - -include $(BUILD_SHARED_LIBRARY) endif diff --git a/crypto/scrypt/Scrypt.mk b/crypto/scrypt/Scrypt.mk index 45af97fc2..04fa6f879 100644 --- a/crypto/scrypt/Scrypt.mk +++ b/crypto/scrypt/Scrypt.mk @@ -24,7 +24,7 @@ endif LOCAL_SRC_FILES += $(target_src_files) LOCAL_CFLAGS += $(target_c_flags) -LOCAL_C_INCLUDES += $(target_c_includes) +LOCAL_C_INCLUDES += $(target_c_includes) bootable/recovery/crypto/scrypt/lib/util LOCAL_MODULE_TAGS := optional LOCAL_MODULE:= libscrypttwrp_static LOCAL_ADDITIONAL_DEPENDENCIES := $(local_additional_dependencies) diff --git a/crypto/scrypt/tests/Android.mk b/crypto/scrypt/tests/Android.mk index 07c21023d..c20b41da9 100644 --- a/crypto/scrypt/tests/Android.mk +++ b/crypto/scrypt/tests/Android.mk @@ -20,6 +20,7 @@ LOCAL_STATIC_LIBRARIES := \ libgtest \ libgtest_main +LOCAL_MODULE_TAGS := optional LOCAL_MODULE := scrypttwrp_test include $(BUILD_NATIVE_TEST) |