From ab435e39a5e56b41dbc6dc6df3c5d45d4c1755c5 Mon Sep 17 00:00:00 2001 From: patricktu Date: Fri, 10 May 2019 15:34:26 +0800 Subject: [PATCH] AIDEGen: Collect the srcjar path of modules into module-info.json By design doc: go/aidegen-doc-generate-R In order to generate R.java of app modules, AIDEGen needs to build the module. It might cause system.img oversized so we turn to build the target srcjar file if it exists in module-info.json. Build module-info.json without this change: Build time: 1m47.227s File size: 14,186,429 Bytes Build module-info.json with this change: Build time: 1m46.796s File size: 14,614,470 Bytes Bug: 132407603 Test: 1. m out/target/product/generic_x86_64/module-info.json 2. by grep "target/common/obj/APPS/Settings_intermediates/aapt2.srcjar" in module-info.json. Change-Id: I09c812aede0324bc38acbead0a863a85ae15b33e --- core/java.mk | 2 ++ core/tasks/module-info.mk | 1 + 2 files changed, 3 insertions(+) diff --git a/core/java.mk b/core/java.mk index b951f14f53..41a168661e 100644 --- a/core/java.mk +++ b/core/java.mk @@ -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) diff --git a/core/tasks/module-info.mk b/core/tasks/module-info.mk index 2c56162d54..2d93128eea 100644 --- a/core/tasks/module-info.mk +++ b/core/tasks/module-info.mk @@ -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 '}' >> $@