Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d7060a50 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Eliminate ENABLE_DEFAULT_TEST_LOCATION as it is always true"

parents 2f5e1836 da25b691

core/base_rules.mk

+5 −7
Original line number Diff line number Diff line
@@ -257,7 +257,6 @@ ifndef LOCAL_COMPATIBILITY_SUITE 
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
@@ -267,7 +266,6 @@ ifdef ENABLE_DEFAULT_TEST_LOCATION 
    endif

  endif

endif

endif



ifeq ($(my_module_path),)

  install_path_var := $(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)OUT$(partition_tag)_$(LOCAL_MODULE_CLASS)

core/config.mk

+1 −4
Original line number Diff line number Diff line
@@ -1183,12 +1183,9 @@ include $(BUILD_SYSTEM)/ninja_config.mk 
include $(BUILD_SYSTEM)/soong_config.mk

endif



# If ENABLE_DEFAULT_TEST_LOCATION is true, move default install path from

# $(my_prefix)OUT_DATA to $(my_prefix)OUT_TESTCASES

ENABLE_DEFAULT_TEST_LOCATION := true

-include external/linux-kselftest/android/kselftest_test_list.mk

-include external/ltp/android/ltp_package_list.mk

DEFAULT_DATA_OUT_MODULES := ltp $(ltp_packages) $(kselftest_modules)

.KATI_READONLY := ENABLE_DEFAULT_TEST_LOCATION DEFAULT_DATA_OUT_MODULES

.KATI_READONLY := DEFAULT_DATA_OUT_MODULES



include $(BUILD_SYSTEM)/dumpvar.mk

core/native_benchmark.mk

+0 −5
Original line number Diff line number Diff line
@@ -6,11 +6,6 @@ $(call record-module-type,NATIVE_BENCHMARK) 


LOCAL_STATIC_LIBRARIES += libgoogle-benchmark



ifndef ENABLE_DEFAULT_TEST_LOCATION

LOCAL_MODULE_PATH_64 := $(TARGET_OUT_DATA_METRIC_TESTS)/$(LOCAL_MODULE)

LOCAL_MODULE_PATH_32 := $($(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_DATA_METRIC_TESTS)/$(LOCAL_MODULE)

endif



ifndef LOCAL_MULTILIB

ifndef LOCAL_32_BIT_ONLY

LOCAL_MULTILIB := both

core/package_internal.mk

+0 −7
Original line number Diff line number Diff line
@@ -767,17 +767,10 @@ $(my_all_targets): $(installed_apk_splits) 


ifdef LOCAL_COMPATIBILITY_SUITE



ifndef ENABLE_DEFAULT_TEST_LOCATION

$(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \

  $(eval my_compat_dist_$(suite) := $(foreach dir, $(call compatibility_suite_dirs,$(suite)), \

    $(foreach s,$(my_split_suffixes),\

      $(intermediates)/package_$(s).apk:$(dir)/$(LOCAL_MODULE)_$(s).apk))))

else

$(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \

  $(eval my_compat_dist_$(suite) := $(foreach dir, $(call compatibility_suite_dirs,$(suite)), \

    $(foreach s,$(my_split_suffixes),\

      $(call compat-copy-pair,$(intermediates)/package_$(s).apk,$(dir)/$(LOCAL_MODULE)_$(s).apk)))))

endif



$(call create-suite-dependencies)

core/target_test_internal.mk

+2 −4
Original line number Diff line number Diff line
@@ -30,11 +30,9 @@ $(error $(LOCAL_PATH): Do not set LOCAL_MODULE_PATH_64 when building test $(LOCA 
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