p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Eliminate ENABLE_DEFAULT_TEST_LOCATION as it is always true" am: d7060a50f9 

am: aa2eb553d8

Change-Id: I5aebaa6c8a4bcf203c4e930039b4476d356cfdfa
This commit is contained in:
Sasha Smundak 2019-03-26 15:27:16 -07:00 committed by android-build-merger
parent 508d4a2797 aa2eb553d8
commit 20f8f5c6ee
5 changed files with 8 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/base_rules.mk
View File

@ -257,13 +257,11 @@ 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
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

5
core/config.mk
View File

@ -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

5
core/native_benchmark.mk
View File

@ -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

7
core/package_internal.mk
View File

@ -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)

6
core/target_test_internal.mk
View File

@ -30,10 +30,8 @@ $(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
ifneq ($(LOCAL_MODULE),$(filter $(LOCAL_MODULE),$(DEFAULT_DATA_OUT_MODULES)))
use_testcase_folder := true
endif
ifneq ($(use_testcase_folder),true)