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

Commit 5539e7b5 authored by Ulyana Trafimovich's avatar Ulyana Trafimovich Committed by Ulya Trafimovich
Browse files

Revert^2 "Rename DexJar interface method to DexJarBuildPath." 

This reverts commit b0dc851f.

Reason for revert: relanding original change. Build failures were
  caused by a race with another CL: https://r.android.com/1320920

Test: lunch aosp_cf_x86_phone-userdebug && m
Change-Id: Ic9016582dae7773b4d4f84a63425f1ef7a5d061f
parent c55b679e

apex/apex.go

+2 −2
Original line number Diff line number Diff line
@@ -1650,14 +1650,14 @@ func apexFileForShBinary(ctx android.BaseModuleContext, sh *sh.ShBinary) apexFil 
}



type javaDependency interface {

	DexJar() android.Path

	DexJarBuildPath() android.Path

	JacocoReportClassesFile() android.Path

	Stem() string

}



func apexFileForJavaLibrary(ctx android.BaseModuleContext, lib javaDependency, module android.Module) apexFile {

	dirInApex := "javalib"

	fileToCopy := lib.DexJar()

	fileToCopy := lib.DexJarBuildPath()

	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) DexJar() android.Path {

func (a *AARImport) DexJarBuildPath() 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.DexJar(); dexJar != nil {

				if dexJar := lib.DexJarBuildPath(); 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) DexJar() android.Path {

func (d *DeviceHostConverter) DexJarBuildPath() 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{ DexJar() android.Path })

	jar, hasJar := module.(interface{ DexJarBuildPath() 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.DexJar()

	return index, jar.DexJarBuildPath()

}



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