commit c30edd12c5b3554c7e7e5b144b1159dcae330603
author Ethan Yonker <dees_troy@teamw.in> Sat Nov 08 07:05:47 2014 -0600
committer Ethan Yonker <dees_troy@teamw.in> Sat Nov 08 07:05:47 2014 -0600
tree 40a8ba215b17f42f8fbf6ac3d991a3107e14011e
parent 24813426b9cf6d4a79e5da68008d1a4532e6c710

Fix potential tree conflicts with scrypt

Change-Id: Iac40957e40cb9c10795dd6a1f67ca902c95dd9bc

crypto/scrypt/Android.mk

diff --git a/crypto/scrypt/Android.mk b/crypto/scrypt/Android.mk
index d06135a..a427de6 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

crypto/scrypt/tests/Android.mk

diff --git a/crypto/scrypt/tests/Android.mk b/crypto/scrypt/tests/Android.mk
index a4562de..60257e0 100644
--- a/crypto/scrypt/tests/Android.mk
+++ b/crypto/scrypt/tests/Android.mk
@@ -18,6 +18,6 @@
     libgtest \
     libgtest_main
 
-LOCAL_MODULE := scrypt_test
+LOCAL_MODULE := scrypt_test_twrp
 
 include $(BUILD_NATIVE_TEST)