Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40b5340a authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents a489a92f ab435e39

core/java.mk

+2 −0
Original line number Diff line number Diff line
@@ -240,6 +240,8 @@ java_sources_deps := \ 
$(java_source_list_file): $(java_sources_deps)

	$(write-java-source-list)



ALL_MODULES.$(my_register_name).SRCJARS := $(LOCAL_SRCJARS)



ifneq ($(TURBINE_ENABLED),false)



$(full_classes_turbine_jar): PRIVATE_JAVACFLAGS := $(LOCAL_JAVACFLAGS) $(annotation_processor_flags)

core/tasks/module-info.mk

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ $(MODULE_INFO_JSON): 
			'"test_config": [$(if $(ALL_MODULES.$(m).TEST_CONFIG),"$(ALL_MODULES.$(m).TEST_CONFIG)")], ' \

			'"dependencies": [$(foreach w,$(sort $(ALL_DEPS.$(m).ALL_DEPS)),"$(w)", )], ' \

			'"srcs": [$(foreach w,$(sort $(ALL_MODULES.$(m).SRCS)),"$(w)", )], ' \

			'"srcjars": [$(foreach w,$(sort $(ALL_MODULES.$(m).SRCJARS)),"$(w)", )], ' \

			'},\n' \

	 ) | sed -e 's/, *\]/]/g' -e 's/, *\}/ }/g' -e '$$s/,$$//' >> $@

	$(hide) echo '}' >> $@