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

Add optional relative path to LOCAL_TEST_DATA processing 

Test: Verified in conjunction with changes to soong (aosp/1359742)
Test: Treehugger to verify backwards compatibility
Change-Id: I39d2669ff74b4387606b6416e8afefc1f6507348
This commit is contained in:
Chris Parsons 2020-07-17 15:27:27 -04:00
parent 9aa278a124
commit 1abe7ef455
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/base_rules.mk
View File

@ -592,12 +592,22 @@ ifneq ($(strip $(filter NATIVE_TESTS,$(LOCAL_MODULE_CLASS)) $(LOCAL_IS_FUZZ_TARG
ifneq ($(strip $(LOCAL_TEST_DATA)),) ifneq ($(strip $(LOCAL_TEST_DATA)),)
ifneq (true,$(LOCAL_UNINSTALLABLE_MODULE)) ifneq (true,$(LOCAL_UNINSTALLABLE_MODULE))
# Soong LOCAL_TEST_DATA is of the form <from_base>:<file>:<relative_install_path>
# or <from_base>:<file>, to be installed to
# <install_root>/<relative_install_path>/<file> or <install_root>/<file>,
# respectively.
ifeq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK)) ifeq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK))
define copy_test_data_pairs define copy_test_data_pairs
_src_base := $$(call word-colon,1,$$(td)) _src_base := $$(call word-colon,1,$$(td))
_file := $$(call word-colon,2,$$(td)) _file := $$(call word-colon,2,$$(td))
my_test_data_pairs += $$(call append-path,$$(_src_base),$$(_file)):$$(call append-path,$$(my_module_path),$$(_file)) _relative_install_path := $$(call word-colon,3,$$(td))
my_test_data_file_pairs += $$(call append-path,$$(_src_base),$$(_file)):$$(_file) ifeq (,$$(_relative_install_path))
_relative_dest_file := $$(_file)
else
_relative_dest_file := $$(call append-path,$$(_relative_install_path),$$(_file))
endif
my_test_data_pairs += $$(call append-path,$$(_src_base),$$(_file)):$$(call append-path,$$(my_module_path),$$(_relative_dest_file))
my_test_data_file_pairs += $$(call append-path,$$(_src_base),$$(_file)):$$(_relative_dest_file)
endef endef
else else
define copy_test_data_pairs define copy_test_data_pairs