openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Add a flag to disable auto-generating test configs." 

am: 6704727b69

Change-Id: I58d40a61f24621ca678bc8f83ecbca284ec90fae
This commit is contained in:
Dan Shi 2018-01-11 23:46:33 +00:00 committed by android-build-merger
parent c6548f8df4 6704727b69
commit d100261cfb
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
core/base_rules.mk
View File

@ -541,14 +541,23 @@ ifeq (,$(test_config))
ifeq (true, $(LOCAL_IS_HOST_MODULE)) ifeq (true, $(LOCAL_IS_HOST_MODULE))
is_instrumentation_test := false is_instrumentation_test := false
endif endif
# If LOCAL_MODULE_CLASS is not APPS, it's certainly not an instrumentation
# test. However, some packages for test data also have LOCAL_MODULE_CLASS
# set to APPS. These will require flag LOCAL_DISABLE_AUTO_GENERATE_TEST_CONFIG
# to disable auto-generating test config file.
ifneq (APPS, $(LOCAL_MODULE_CLASS))
is_instrumentation_test := false
endif
endif endif
# CTS modules can be used for test data, so test config files must be # CTS modules can be used for test data, so test config files must be
# explicitly created using AndroidTest.xml # explicitly created using AndroidTest.xml
ifeq (,$(filter cts, $(LOCAL_COMPATIBILITY_SUITE))) ifeq (,$(filter cts, $(LOCAL_COMPATIBILITY_SUITE)))
ifeq (true, $(filter true,$(is_native) $(is_instrumentation_test))) ifneq (true, $(LOCAL_DISABLE_AUTO_GENERATE_TEST_CONFIG))
include $(BUILD_SYSTEM)/autogen_test_config.mk ifeq (true, $(filter true,$(is_native) $(is_instrumentation_test)))
test_config := $(autogen_test_config_file) include $(BUILD_SYSTEM)/autogen_test_config.mk
autogen_test_config_file := test_config := $(autogen_test_config_file)
autogen_test_config_file :=
endif
endif endif
endif endif
endif endif

1
core/clear_vars.mk
View File

@ -55,6 +55,7 @@ LOCAL_DEX_PREOPT_GENERATE_PROFILE:=
LOCAL_DEX_PREOPT_IMAGE_LOCATION:= LOCAL_DEX_PREOPT_IMAGE_LOCATION:=
LOCAL_DEX_PREOPT_PROFILE_CLASS_LISTING:= LOCAL_DEX_PREOPT_PROFILE_CLASS_LISTING:=
LOCAL_DEX_PREOPT:= # '',true,false,nostripping LOCAL_DEX_PREOPT:= # '',true,false,nostripping
LOCAL_DISABLE_AUTO_GENERATE_TEST_CONFIG:=
LOCAL_DONT_CHECK_MODULE:= LOCAL_DONT_CHECK_MODULE:=
# Don't delete the META_INF dir when merging static Java libraries. # Don't delete the META_INF dir when merging static Java libraries.
LOCAL_DONT_DELETE_JAR_META_INF:= LOCAL_DONT_DELETE_JAR_META_INF:=