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

Merge "AIDEGen: Collect the srcjar path of modules into module-info.json"

Browse Source
This commit is contained in:
Treehugger Robot
2019-05-21 02:02:20 +00:00
committed by Gerrit Code Review
parent a489a92fdc ab435e39a5
commit 40b5340a94
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java.mk
View File

@@ -240,6 +240,8 @@ java_sources_deps := \
$(java_source_list_file): $(java_sources_deps) $(java_source_list_file): $(java_sources_deps)
$(write-java-source-list) $(write-java-source-list)
ALL_MODULES.$(my_register_name).SRCJARS := $(LOCAL_SRCJARS)
ifneq ($(TURBINE_ENABLED),false) ifneq ($(TURBINE_ENABLED),false)
$(full_classes_turbine_jar): PRIVATE_JAVACFLAGS := $(LOCAL_JAVACFLAGS) $(annotation_processor_flags) $(full_classes_turbine_jar): PRIVATE_JAVACFLAGS := $(LOCAL_JAVACFLAGS) $(annotation_processor_flags)

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

@@ -17,6 +17,7 @@ $(MODULE_INFO_JSON):
'"test_config": [$(if $(ALL_MODULES.$(m).TEST_CONFIG),"$(ALL_MODULES.$(m).TEST_CONFIG)")], ' \ '"test_config": [$(if $(ALL_MODULES.$(m).TEST_CONFIG),"$(ALL_MODULES.$(m).TEST_CONFIG)")], ' \
'"dependencies": [$(foreach w,$(sort $(ALL_DEPS.$(m).ALL_DEPS)),"$(w)", )], ' \ '"dependencies": [$(foreach w,$(sort $(ALL_DEPS.$(m).ALL_DEPS)),"$(w)", )], ' \
'"srcs": [$(foreach w,$(sort $(ALL_MODULES.$(m).SRCS)),"$(w)", )], ' \ '"srcs": [$(foreach w,$(sort $(ALL_MODULES.$(m).SRCS)),"$(w)", )], ' \
'"srcjars": [$(foreach w,$(sort $(ALL_MODULES.$(m).SRCJARS)),"$(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 '}' >> $@