diff options
| author | Ethan Yonker <dees_troy@teamw.in> | 2014-11-25 22:00:52 +0100 |
|---|---|---|
| committer | Dees Troy <dees_troy@teamw.in> | 2014-12-04 17:30:16 +0100 |
| commit | 253368a0726120efa57664cdd1d088af099a3d81 (patch) | |
| tree | 56cf3b08cdf70d016a2411fba977f7cd143bc265 /crypto/scrypt | |
| parent | bootable recovery: we upgraded to 5.0.1 (diff) | |
| download | android_bootable_recovery-253368a0726120efa57664cdd1d088af099a3d81.tar android_bootable_recovery-253368a0726120efa57664cdd1d088af099a3d81.tar.gz android_bootable_recovery-253368a0726120efa57664cdd1d088af099a3d81.tar.bz2 android_bootable_recovery-253368a0726120efa57664cdd1d088af099a3d81.tar.lz android_bootable_recovery-253368a0726120efa57664cdd1d088af099a3d81.tar.xz android_bootable_recovery-253368a0726120efa57664cdd1d088af099a3d81.tar.zst android_bootable_recovery-253368a0726120efa57664cdd1d088af099a3d81.zip | |
Diffstat (limited to 'crypto/scrypt')
| -rw-r--r-- | crypto/scrypt/Android.mk | 3 | ||||
| -rw-r--r-- | crypto/scrypt/Scrypt-config.mk | 4 | ||||
| -rw-r--r-- | crypto/scrypt/tests/Android.mk | 4 | ||||
| -rw-r--r-- | crypto/scrypt/tests/scrypt_test.cpp | 2 |
4 files changed, 8 insertions, 5 deletions
diff --git a/crypto/scrypt/Android.mk b/crypto/scrypt/Android.mk index a427de655..4514f9467 100644 --- a/crypto/scrypt/Android.mk +++ b/crypto/scrypt/Android.mk @@ -1,5 +1,4 @@ LOCAL_PATH := $(call my-dir) -#include $(call all-named-subdir-makefiles,tests) # Enable to be able to use ALOG* with #include "cutils/log.h" #log_c_includes += system/core/include @@ -10,3 +9,5 @@ LOCAL_PATH := $(call my-dir) # that import_openssl.sh import won't remove them. include $(LOCAL_PATH)/build-config.mk include $(LOCAL_PATH)/Scrypt.mk + +include $(LOCAL_PATH)/tests/Android.mk diff --git a/crypto/scrypt/Scrypt-config.mk b/crypto/scrypt/Scrypt-config.mk index c0b00d873..bbe10631e 100644 --- a/crypto/scrypt/Scrypt-config.mk +++ b/crypto/scrypt/Scrypt-config.mk @@ -77,7 +77,7 @@ target_arch := unknown_arch endif target_c_flags := $(common_c_flags) $($(target_arch)_c_flags) $(local_c_flags) -target_c_includes := $(addprefix $(commands_recovery_local_path)/crypto/scrypt/,$(common_c_includes)) $(local_c_includes) +target_c_includes := $(addprefix external/scrypt/,$(common_c_includes)) $(local_c_includes) target_src_files := $(common_src_files) $($(target_arch)_src_files) target_src_files := $(filter-out $($(target_arch)_exclude_files), $(target_src_files)) @@ -97,7 +97,7 @@ host_arch := unknown_arch endif host_c_flags := $(common_c_flags) $($(host_arch)_c_flags) $(local_c_flags) -host_c_includes := $(addprefix $(commands_recovery_local_path)/crypto/scrypt/,$(common_c_includes)) $(local_c_includes) +host_c_includes := $(addprefix external/scrypt/,$(common_c_includes)) $(local_c_includes) host_src_files := $(common_src_files) $($(host_arch)_src_files) host_src_files := $(filter-out $($(host_arch)_exclude_files), $(host_src_files)) diff --git a/crypto/scrypt/tests/Android.mk b/crypto/scrypt/tests/Android.mk index 60257e0f9..07c21023d 100644 --- a/crypto/scrypt/tests/Android.mk +++ b/crypto/scrypt/tests/Android.mk @@ -3,6 +3,8 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk + LOCAL_SRC_FILES:= \ scrypt_test.cpp @@ -18,6 +20,6 @@ LOCAL_STATIC_LIBRARIES := \ libgtest \ libgtest_main -LOCAL_MODULE := scrypt_test_twrp +LOCAL_MODULE := scrypttwrp_test include $(BUILD_NATIVE_TEST) diff --git a/crypto/scrypt/tests/scrypt_test.cpp b/crypto/scrypt/tests/scrypt_test.cpp index 28334d6f5..ffb568df9 100644 --- a/crypto/scrypt/tests/scrypt_test.cpp +++ b/crypto/scrypt/tests/scrypt_test.cpp @@ -15,8 +15,8 @@ */ #define LOG_TAG "scrypt_test" +#include <UniquePtr.h> #include <utils/Log.h> -#include <utils/UniquePtr.h> #include <gtest/gtest.h> |