diff options
| author | 2024-08-12 16:40:30 +0000 | |
|---|---|---|
| committer | 2024-08-12 16:40:30 +0000 | |
| commit | 9dfccb91a5dfc1bf3637a52165081a54c81c159d (patch) | |
| tree | a783c01e307a82a9e9eb8b91cb83c83403541ff7 /java/base.go | |
| parent | d0338d3565cf1efcf27d7932e4ed62faa09a6076 (diff) | |
| parent | b4cd5df5736b0561471d0861a2d8a6b0d1cdf118 (diff) | |
Merge changes Ib4581079,Ia3887bae into main
* changes:
Make IdeInfo aware of jarjar-ing
Add .internal modules to IDEInfo.deps of top-level java_sdk_library
Diffstat (limited to 'java/base.go')
| -rw-r--r-- | java/base.go | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/java/base.go b/java/base.go index f820629e9..49ff22f93 100644 --- a/java/base.go +++ b/java/base.go @@ -2027,16 +2027,20 @@ func (j *Module) ClassLoaderContexts() dexpreopt.ClassLoaderContextMap { // Collect information for opening IDE project files in java/jdeps.go. 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...) + // jarjar rules will repackage the sources. To prevent misleading results, IdeInfo should contain the + // repackaged jar instead of the input sources. if j.expandJarjarRules != nil { dpInfo.Jarjar_rules = append(dpInfo.Jarjar_rules, j.expandJarjarRules.String()) + dpInfo.Jars = append(dpInfo.Jars, j.headerJarFile.String()) + } else { + dpInfo.Srcs = append(dpInfo.Srcs, j.expandIDEInfoCompiledSrcs...) + dpInfo.SrcJars = append(dpInfo.SrcJars, j.compiledSrcJars.Strings()...) + dpInfo.SrcJars = append(dpInfo.SrcJars, j.annoSrcJars.Strings()...) } + dpInfo.Deps = append(dpInfo.Deps, j.CompilerDeps()...) + dpInfo.Aidl_include_dirs = append(dpInfo.Aidl_include_dirs, j.deviceProperties.Aidl.Include_dirs...) dpInfo.Static_libs = append(dpInfo.Static_libs, j.properties.Static_libs...) dpInfo.Libs = append(dpInfo.Libs, j.properties.Libs...) - dpInfo.SrcJars = append(dpInfo.SrcJars, j.annoSrcJars.Strings()...) } func (j *Module) CompilerDeps() []string { |