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

Merge "Fix test data to use my_test_data_file_pairs" into main am: faa072b97f

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2842097

Change-Id: Icbed5abe705a64402dd33ef3fe046b318f70bb25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Colin Cross
2023-12-05 05:56:25 +00:00
committed by Automerger Merge Worker
parent 9b83205f41 faa072b97f
commit 691e2d574a
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 := \
$(ALL_MODULES.$(my_register_name).LOCAL_STATIC_LIBRARIES) $(LOCAL_STATIC_JAVA_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 # 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 # by tests at runtime. The format of my_test_data_file_pairs is
# https://cs.android.com/android/platform/superproject/+/master:build/soong/android/androidmk.go;l=925-944;drc=master # is $(path):$(relative_file) but for module-info, only the string after
# which format is like $(path):$(relative_file) but for module-info, only # ":" is needed.
# the string after ":" is needed.
ALL_MODULES.$(my_register_name).TEST_DATA := \ ALL_MODULES.$(my_register_name).TEST_DATA := \
$(strip $(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)))) $(call word-colon,2,$(f))))
endif endif