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

Merge "Add data_bins to data_dependencies in module-info"

Browse Source
This commit is contained in:
Treehugger Robot
2022-02-18 01:26:07 +00:00
committed by Gerrit Code Review
parent 94daa8bfab e6b498bf2d
commit 0eebb8580e
3 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/base_rules.mk
View File

@@ -996,6 +996,11 @@ ifdef LOCAL_TEST_DATA
$(call word-colon,2,$(f)))) $(call word-colon,2,$(f))))
endif endif
ifdef LOCAL_TEST_DATA_BINS
ALL_MODULES.$(my_register_name).TEST_DATA_BINS := \
$(ALL_MODULES.$(my_register_name).TEST_DATA_BINS) $(LOCAL_TEST_DATA_BINS)
endif
########################################################################## ##########################################################################
## When compiling against the VNDK, add the .vendor or .product suffix to ## When compiling against the VNDK, add the .vendor or .product suffix to
## required modules. ## required modules.

1
core/clear_vars.mk
View File

@@ -318,6 +318,7 @@ LOCAL_SYSTEM_SHARED_LIBRARIES:=none
LOCAL_TARGET_REQUIRED_MODULES:= LOCAL_TARGET_REQUIRED_MODULES:=
LOCAL_TEST_CONFIG:= LOCAL_TEST_CONFIG:=
LOCAL_TEST_DATA:= LOCAL_TEST_DATA:=
LOCAL_TEST_DATA_BINS:=
LOCAL_TEST_MAINLINE_MODULES:= LOCAL_TEST_MAINLINE_MODULES:=
LOCAL_TEST_MODULE_TO_PROGUARD_WITH:= LOCAL_TEST_MODULE_TO_PROGUARD_WITH:=
LOCAL_TIDY:= LOCAL_TIDY:=

1
core/tasks/module-info.mk
View File

@@ -26,6 +26,7 @@ $(MODULE_INFO_JSON):
'"is_unit_test": "$(ALL_MODULES.$(m).IS_UNIT_TEST)", ' \ '"is_unit_test": "$(ALL_MODULES.$(m).IS_UNIT_TEST)", ' \
'"data": [$(foreach w,$(sort $(ALL_MODULES.$(m).TEST_DATA)),"$(w)", )], ' \ '"data": [$(foreach w,$(sort $(ALL_MODULES.$(m).TEST_DATA)),"$(w)", )], ' \
'"runtime_dependencies": [$(foreach w,$(sort $(ALL_MODULES.$(m).LOCAL_RUNTIME_LIBRARIES)),"$(w)", )], ' \ '"runtime_dependencies": [$(foreach w,$(sort $(ALL_MODULES.$(m).LOCAL_RUNTIME_LIBRARIES)),"$(w)", )], ' \
'"data_dependencies": [$(foreach w,$(sort $(ALL_MODULES.$(m).TEST_DATA_BINS)),"$(w)", )], ' \
'},\n' \ '},\n' \
) | sed -e 's/, *\]/]/g' -e 's/, *\}/ }/g' -e '$$s/,$$//' >> $@ ) | sed -e 's/, *\]/]/g' -e 's/, *\}/ }/g' -e '$$s/,$$//' >> $@
$(hide) echo '}' >> $@ $(hide) echo '}' >> $@