diff options
| -rw-r--r-- | core/base_rules.mk | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/core/base_rules.mk b/core/base_rules.mk index 915b480513..f533358e5f 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -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 |