StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix test data to use my_test_data_file_pairs

Browse Source 
The format of LOCAL_TEST_DATA when provided by Soong can included a
third colon-separated field with an extra relative path that is not
being handled when assigning to ALL_MODULES.$(my_register_name).TEST_DATA.
Use my_test_data_file_pairs instead, which has already been transformed
to a src:dest pair.

Bug: 311428265
Test: examine module-info.json
Change-Id: I3a089cc24ea1492f1f7cf891c73ee7b43f273bb3
This commit is contained in:
Colin Cross
2023-11-16 15:39:13 -08:00
parent 4ea5e85143
commit 7bf03bf68e
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/base_rules.mk
View File

@@ -1023,15 +1023,14 @@ ALL_MODULES.$(my_register_name).LOCAL_RUNTIME_LIBRARIES := \
ALL_MODULES.$(my_register_name).LOCAL_STATIC_LIBRARIES := \
$(ALL_MODULES.$(my_register_name).LOCAL_STATIC_LIBRARIES) $(LOCAL_STATIC_JAVA_LIBRARIES)
ifdef LOCAL_TEST_DATA
ifneq ($(my_test_data_file_pairs),)
# Export the list of targets that are handled as data inputs and required
# by tests at runtime. The LOCAL_TEST_DATA format is generated from below
# https://cs.android.com/android/platform/superproject/+/master:build/soong/android/androidmk.go;l=925-944;drc=master
# which format is like $(path):$(relative_file) but for module-info, only
# the string after ":" is needed.
# by tests at runtime. The format of my_test_data_file_pairs is
# is $(path):$(relative_file) but for module-info, only the string after
# ":" is needed.
ALL_MODULES.$(my_register_name).TEST_DATA := \
$(strip $(ALL_MODULES.$(my_register_name).TEST_DATA) \
$(foreach f, $(LOCAL_TEST_DATA),\
$(foreach f, $(my_test_data_file_pairs),\
$(call word-colon,2,$(f))))
endif