commit da25b691d3e5f932525236b8839b589725e8ddcb
author Sasha Smundak <asmundak@google.com> Mon Mar 25 13:26:03 2019 -0700
committer Sasha Smundak <asmundak@google.com> Mon Mar 25 13:26:03 2019 -0700
tree de2e581c3d38d696bd54e6cdaadaaf3b990bea9e
parent 072795054a4284924067c5e7e9fa1ca56cb9598a

Eliminate ENABLE_DEFAULT_TEST_LOCATION as it is always true

Bug: 117224272
Test: treehugger
Change-Id: Idd47ead31fcd89dbf728f140dc3353e5013ba352

core/base_rules.mk

diff --git a/core/base_rules.mk b/core/base_rules.mk
index 7e7d6dc..f477eda 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -257,13 +257,11 @@
 endif
 
 use_testcase_folder :=
-ifdef ENABLE_DEFAULT_TEST_LOCATION
-  ifeq ($(my_module_path),)
-    ifneq ($(LOCAL_MODULE),$(filter $(LOCAL_MODULE),$(DEFAULT_DATA_OUT_MODULES)))
-      ifdef LOCAL_COMPATIBILITY_SUITE
-        ifneq (true, $(LOCAL_IS_HOST_MODULE))
-          use_testcase_folder := true
-        endif
+ifeq ($(my_module_path),)
+  ifneq ($(LOCAL_MODULE),$(filter $(LOCAL_MODULE),$(DEFAULT_DATA_OUT_MODULES)))
+    ifdef LOCAL_COMPATIBILITY_SUITE
+      ifneq (true, $(LOCAL_IS_HOST_MODULE))
+        use_testcase_folder := true
       endif
     endif
   endif