diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/droiddoc.go | 26 | ||||
| -rw-r--r-- | java/java.go | 26 |
2 files changed, 4 insertions, 48 deletions
diff --git a/java/droiddoc.go b/java/droiddoc.go index 96c841638..16e6921e1 100644 --- a/java/droiddoc.go +++ b/java/droiddoc.go @@ -1979,28 +1979,6 @@ func (d *Droidstubs) BuildSnapshot(sdkModuleContext android.ModuleContext, build snapshotRelativeDir := filepath.Join("java", d.Name()+"_stubs_sources") builder.UnzipToSnapshot(stubsSrcJar, snapshotRelativeDir) - d.generatePrebuiltStubsSources(builder, snapshotRelativeDir, true) - - // This module is for the case when the source tree for the unversioned module - // doesn't exist (i.e. building in an unbundled tree). "prefer:" is set to false - // so that this module does not eclipse the unversioned module if it exists. - d.generatePrebuiltStubsSources(builder, snapshotRelativeDir, false) -} - -func (d *Droidstubs) generatePrebuiltStubsSources(builder android.SnapshotBuilder, snapshotRelativeDir string, versioned bool) { - bp := builder.AndroidBpFile() - name := d.Name() - bp.Printfln("prebuilt_stubs_sources {") - bp.Indent() - if versioned { - bp.Printfln("name: %q,", builder.VersionedSdkMemberName(name)) - bp.Printfln("sdk_member_name: %q,", name) - } else { - bp.Printfln("name: %q,", name) - bp.Printfln("prefer: false,") - } - bp.Printfln("srcs: [%q],", snapshotRelativeDir) - bp.Dedent() - bp.Printfln("}") - bp.Printfln("") + pbm := builder.AddPrebuiltModule(sdkModuleContext.OtherModuleName(d), "prebuilt_stubs_sources") + pbm.AddProperty("srcs", []string{snapshotRelativeDir}) } diff --git a/java/java.go b/java/java.go index 5cd074ab1..9c0fcbaa0 100644 --- a/java/java.go +++ b/java/java.go @@ -1737,30 +1737,8 @@ func (j *Library) BuildSnapshot(sdkModuleContext android.ModuleContext, builder } } - j.generateJavaImport(builder, snapshotRelativeJavaLibPath, true) - - // This module is for the case when the source tree for the unversioned module - // doesn't exist (i.e. building in an unbundled tree). "prefer:" is set to false - // so that this module does not eclipse the unversioned module if it exists. - j.generateJavaImport(builder, snapshotRelativeJavaLibPath, false) -} - -func (j *Library) generateJavaImport(builder android.SnapshotBuilder, snapshotRelativeJavaLibPath string, versioned bool) { - bp := builder.AndroidBpFile() - name := j.Name() - bp.Printfln("java_import {") - bp.Indent() - if versioned { - bp.Printfln("name: %q,", builder.VersionedSdkMemberName(name)) - bp.Printfln("sdk_member_name: %q,", name) - } else { - bp.Printfln("name: %q,", name) - bp.Printfln("prefer: false,") - } - bp.Printfln("jars: [%q],", snapshotRelativeJavaLibPath) - bp.Dedent() - bp.Printfln("}") - bp.Printfln("") + module := builder.AddPrebuiltModule(sdkModuleContext.OtherModuleName(j), "java_import") + module.AddProperty("jars", []string{snapshotRelativeJavaLibPath}) } // java_library builds and links sources into a `.jar` file for the device, and possibly for the host as well. |