summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorEthan Yonker <dees_troy@teamw.in>2014-11-08 14:05:47 +0100
committerEthan Yonker <dees_troy@teamw.in>2014-11-08 14:05:47 +0100
commitc30edd12c5b3554c7e7e5b144b1159dcae330603 (patch)
tree40a8ba215b17f42f8fbf6ac3d991a3107e14011e /crypto
parentUpdate adb sideload feature (diff)
downloadandroid_bootable_recovery-c30edd12c5b3554c7e7e5b144b1159dcae330603.tar
android_bootable_recovery-c30edd12c5b3554c7e7e5b144b1159dcae330603.tar.gz
android_bootable_recovery-c30edd12c5b3554c7e7e5b144b1159dcae330603.tar.bz2
android_bootable_recovery-c30edd12c5b3554c7e7e5b144b1159dcae330603.tar.lz
android_bootable_recovery-c30edd12c5b3554c7e7e5b144b1159dcae330603.tar.xz
android_bootable_recovery-c30edd12c5b3554c7e7e5b144b1159dcae330603.tar.zst
android_bootable_recovery-c30edd12c5b3554c7e7e5b144b1159dcae330603.zip
Diffstat (limited to 'crypto')
-rw-r--r--crypto/scrypt/Android.mk2
-rw-r--r--crypto/scrypt/tests/Android.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/crypto/scrypt/Android.mk b/crypto/scrypt/Android.mk
index d06135a1e..a427de655 100644
--- a/crypto/scrypt/Android.mk
+++ b/crypto/scrypt/Android.mk
@@ -1,5 +1,5 @@
LOCAL_PATH := $(call my-dir)
-include $(call all-named-subdir-makefiles,tests)
+#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
diff --git a/crypto/scrypt/tests/Android.mk b/crypto/scrypt/tests/Android.mk
index a4562de93..60257e0f9 100644
--- a/crypto/scrypt/tests/Android.mk
+++ b/crypto/scrypt/tests/Android.mk
@@ -18,6 +18,6 @@ LOCAL_STATIC_LIBRARIES := \
libgtest \
libgtest_main
-LOCAL_MODULE := scrypt_test
+LOCAL_MODULE := scrypt_test_twrp
include $(BUILD_NATIVE_TEST)