Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b0dc851f authored Jun 04, 2020 by Ulyana Trafimovich

Revert "Rename DexJar interface method to DexJarBuildPath."

This reverts commit 562c2401.

Reason for revert: breaks `lunch full-eng && m checkbuild`.

Change-Id: Id7c7d6240d98afaf8edd49b6c96cd05534b784cc

parent 562c2401

apex/apex.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -1656,7 +1656,7 @@ type javaDependency interface {

		func apexFileForJavaLibrary(ctx android.BaseModuleContext, lib javaDependency, module android.Module) apexFile {
		dirInApex := "javalib"
		fileToCopy := lib.DexJarBuildPath()
		fileToCopy := lib.DexJar()
		af := newApexFile(ctx, fileToCopy, module.Name(), dirInApex, javaSharedLib, module)
		af.jacocoReportClassesFile = lib.JacocoReportClassesFile()
		af.stem = lib.Stem() + ".jar"

java/aar.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -730,7 +730,7 @@ func (a *AARImport) ImplementationAndResourcesJars() android.Paths {
		return android.Paths{a.classpathFile}
		}

		func (a *AARImport) DexJarBuildPath() android.Path {
		func (a *AARImport) DexJar() android.Path {
		return nil
		}

java/app.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -1882,7 +1882,7 @@ func (u *usesLibrary) usesLibraryPaths(ctx android.ModuleContext) map[string]and
		if !ctx.Config().UnbundledBuild() {
		ctx.VisitDirectDepsWithTag(usesLibTag, func(m android.Module) {
		if lib, ok := m.(Dependency); ok {
		if dexJar := lib.DexJarBuildPath(); dexJar != nil {
		if dexJar := lib.DexJar(); dexJar != nil {
		usesLibPaths[ctx.OtherModuleName(m)] = dexJar
		} else {
		ctx.ModuleErrorf("module %q in uses_libs or optional_uses_libs must produce a dex jar, does it have installable: true?",

java/device_host_converter.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -150,7 +150,7 @@ func (d *DeviceHostConverter) ImplementationAndResourcesJars() android.Paths {
		return d.implementationAndResourceJars
		}

		func (d *DeviceHostConverter) DexJarBuildPath() android.Path {
		func (d *DeviceHostConverter) DexJar() android.Path {
		return nil
		}

java/dexpreopt_bootjars.go

+2 −2

Original line number	Diff line number	Diff line
		@@ -255,7 +255,7 @@ func getBootImageJar(ctx android.SingletonContext, image *bootImageConfig, modul
		return -1, nil
		}

		jar, hasJar := module.(interface{ DexJarBuildPath() android.Path })
		jar, hasJar := module.(interface{ DexJar() android.Path })
		if !hasJar {
		return -1, nil
		}
		@@ -296,7 +296,7 @@ func getBootImageJar(ctx android.SingletonContext, image *bootImageConfig, modul
		panic("unknown boot image: " + image.name)
		}

		return index, jar.DexJarBuildPath()
		return index, jar.DexJar()
		}

		// buildBootImage takes a bootImageConfig, creates rules to build it, and returns the image.