commit 1f8357fe7dbf598404f756cc136fbc893d231f63
author Nelson Li <nelsonli@google.com> Thu Mar 14 01:04:05 2019 +0000
committer Nelson Li <nelsonli@google.com> Thu Mar 14 01:05:36 2019 +0000
tree 51508ec877e84d09a81988b6adff6778825c946f
parent 6fe7f194b9ba0375aeee6f0d93f74f95a820084b

Revert "Revert "Build System: Solve dependency problem for test""

This reverts commit 6fe7f194b9ba0375aeee6f0d93f74f95a820084b.

Reason for revert: Fixed all build break.

Change-Id: I0a4842df1225399752515a4cd7a7c14173a5bf7b

core/target_test_internal.mk

diff --git a/core/target_test_internal.mk b/core/target_test_internal.mk
index b5c3a7c..1ed1195 100644
--- a/core/target_test_internal.mk
+++ b/core/target_test_internal.mk
@@ -29,6 +29,15 @@
 $(error $(LOCAL_PATH): Do not set LOCAL_MODULE_PATH_64 when building test $(LOCAL_MODULE))
 endif
 
+use_testcase_folder := false
+ifdef ENABLE_DEFAULT_TEST_LOCATION
+  ifneq ($(LOCAL_MODULE),$(filter $(LOCAL_MODULE),$(DEFAULT_DATA_OUT_MODULES)))
+    use_testcase_folder := true
+  endif
+endif
+
+ifneq ($(use_testcase_folder),true)
 ifndef LOCAL_MODULE_RELATIVE_PATH
 LOCAL_MODULE_RELATIVE_PATH := $(LOCAL_MODULE)
 endif
+endif