commit 18c82ffea75a108e89ac5ae34eaeb494a0559d4c
author patricktu <patricktu@google.com> Fri May 10 15:48:50 2019 +0800
committer Patrick Tu <patricktu@google.com> Mon May 27 11:34:10 2019 +0000
tree a860e3adb6ff022cb9c7cbdc0f63c30660b71e97
parent 4af530ff720ab3d932cd5ab0845ef98ae9a8807c

AIDEGen: Collect the srcjar into out/soong/module_bp_java_deps.json

Build module_bp_java_deps.json without this change:
Build time: 3m53.761s
File size: 12,955,363 Bytes

Build module_bp_java_deps.json with this change:
Build time: 3m49.106s
File size: 13,361,647 Bytes

Bug: 132407603
Test: 1. SOONG_COLLECT_JAVA_DEPS=false make nothing
      2. SOONG_COLLECT_JAVA_DEPS=true make nothing
      3. Check module_bp_java_deps.json in /out/soong.
         In SettingsProvider section there should contain
         "srcjars": [
             "out/soong/.intermediates/frameworks/base/packages/SettingsProvider/SettingsProvider/android_common/gen/R.jar"
         ]

Change-Id: I800a4d4f13b280d7ef87005e599cbd0aaf8c93f4

java/java.go

diff --git a/java/java.go b/java/java.go
index e764ec3..1c455f9 100644
--- a/java/java.go
+++ b/java/java.go
@@ -1469,6 +1469,7 @@
 func (j *Module) IDEInfo(dpInfo *android.IdeInfo) {
 	dpInfo.Deps = append(dpInfo.Deps, j.CompilerDeps()...)
 	dpInfo.Srcs = append(dpInfo.Srcs, j.expandIDEInfoCompiledSrcs...)
+	dpInfo.SrcJars = append(dpInfo.SrcJars, j.compiledSrcJars.Strings()...)
 	dpInfo.Aidl_include_dirs = append(dpInfo.Aidl_include_dirs, j.deviceProperties.Aidl.Include_dirs...)
 	if j.expandJarjarRules != nil {
 		dpInfo.Jarjar_rules = append(dpInfo.Jarjar_rules, j.expandJarjarRules.String())