From c30edd12c5b3554c7e7e5b144b1159dcae330603 Mon Sep 17 00:00:00 2001
From: Ethan Yonker <dees_troy@teamw.in>
Date: Sat, 8 Nov 2014 07:05:47 -0600
Subject: Fix potential tree conflicts with scrypt

Change-Id: Iac40957e40cb9c10795dd6a1f67ca902c95dd9bc
---
 crypto/scrypt/Android.mk       | 2 +-
 crypto/scrypt/tests/Android.mk | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'crypto')

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)
-- 
cgit v1.2.3