diff options
| author | 2019-05-10 15:48:50 +0800 | |
|---|---|---|
| committer | 2019-05-27 11:34:10 +0000 | |
| commit | 18c82ffea75a108e89ac5ae34eaeb494a0559d4c (patch) | |
| tree | a860e3adb6ff022cb9c7cbdc0f63c30660b71e97 | |
| parent | 4af530ff720ab3d932cd5ab0845ef98ae9a8807c (diff) | |
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
| -rw-r--r-- | android/module.go | 1 | ||||
| -rw-r--r-- | java/java.go | 1 | ||||
| -rw-r--r-- | java/jdeps.go | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/android/module.go b/android/module.go index fb5c00acb..bcefca0ba 100644 --- a/android/module.go +++ b/android/module.go @@ -1736,4 +1736,5 @@ type IdeInfo struct { Jars []string `json:"jars,omitempty"` Classes []string `json:"class,omitempty"` Installed_paths []string `json:"installed,omitempty"` + SrcJars []string `json:"srcjars,omitempty"` } diff --git a/java/java.go b/java/java.go index e764ec303..1c455f9c8 100644 --- a/java/java.go +++ b/java/java.go @@ -1469,6 +1469,7 @@ func (j *Module) logtags() android.Paths { 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()) diff --git a/java/jdeps.go b/java/jdeps.go index 18498befc..fccc40fa8 100644 --- a/java/jdeps.go +++ b/java/jdeps.go @@ -72,6 +72,7 @@ func (j *jdepsGeneratorSingleton) GenerateBuildActions(ctx android.SingletonCont dpInfo.Aidl_include_dirs = android.FirstUniqueStrings(dpInfo.Aidl_include_dirs) dpInfo.Jarjar_rules = android.FirstUniqueStrings(dpInfo.Jarjar_rules) dpInfo.Jars = android.FirstUniqueStrings(dpInfo.Jars) + dpInfo.SrcJars = android.FirstUniqueStrings(dpInfo.SrcJars) moduleInfos[name] = dpInfo mkProvider, ok := module.(android.AndroidMkDataProvider) |