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

Commit 9ee66da8 authored by Paul Duffin's avatar Paul Duffin
Browse files

Fix check-boot-jars when a boot jar is provided by prebuilt 

Previously, when a boot jar was provided by a java_sdk_library_import
module the check-boot-jars check failed because the file it depended on
was not available. In an incremental build the build failed due to the
file in the out directory not having a rule to generate it.

That was because the module was named prebuilt_<module>.<apex> instead
of <module>.<apex>. This was fixed by simply removing prebuilt_ prefix
from the name if it was present.

After fixing that the check-boot-jars still did not work properly
because it was expecting a jar file containing .class files but instead
was given a jar file containing .dex files which meant the check did
not work properly.

This was fixed by defining a new ApexDependency interface for use by
the apex/apex.go code to use instead of java.Dependency for generating
the androidmk entries. The *SdkLibraryImport type then implemented
those, by delegating to the implementation library.

Bug: 158304459
Bug: 159112414
Test: m check-boot-jars
      m checkbuild
	  manual inspection of the .jar file used by check-boot-jars to
	  ensure it contained .class files and not .dex files.
Change-Id: I545c5c9072dd472337d2f9b4dfdf08f53c981662
Merged-In: I545c5c9072dd472337d2f9b4dfdf08f53c981662
parent 5ef04d1e

apex/androidmk.go

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ func (a *apexBundle) androidMkForFiles(w io.Writer, apexBundleName, apexName, mo 
			// we need to remove the suffix from LOCAL_MODULE_STEM, otherwise

			// we will have foo.jar.jar

			fmt.Fprintln(w, "LOCAL_MODULE_STEM :=", strings.TrimSuffix(fi.Stem(), ".jar"))

			if javaModule, ok := fi.module.(java.Dependency); ok {

			if javaModule, ok := fi.module.(java.ApexDependency); ok {

				fmt.Fprintln(w, "LOCAL_SOONG_CLASSES_JAR :=", javaModule.ImplementationAndResourcesJars()[0].String())

				fmt.Fprintln(w, "LOCAL_SOONG_HEADER_JAR :=", javaModule.HeaderJars()[0].String())

			} else {

apex/apex.go

+3 −1
Original line number Diff line number Diff line
@@ -1685,7 +1685,9 @@ type javaDependency interface { 
func apexFileForJavaLibrary(ctx android.BaseModuleContext, lib javaDependency, module android.Module) apexFile {

	dirInApex := "javalib"

	fileToCopy := lib.DexJar()

	af := newApexFile(ctx, fileToCopy, module.Name(), dirInApex, javaSharedLib, module)

	// Remove prebuilt_ if necessary so the source and prebuilt modules have the same name.

	name := strings.TrimPrefix(module.Name(), "prebuilt_")

	af := newApexFile(ctx, fileToCopy, name, dirInApex, javaSharedLib, module)

	af.jacocoReportClassesFile = lib.JacocoReportClassesFile()

	af.stem = lib.Stem() + ".jar"

	return af

java/java.go

+7 −2
Original line number Diff line number Diff line
@@ -517,11 +517,16 @@ func (j *Module) OutputFiles(tag string) (android.Paths, error) { 


var _ android.OutputFileProducer = (*Module)(nil)



type Dependency interface {

// Methods that need to be implemented for a module that is added to apex java_libs property.

type ApexDependency interface {

	HeaderJars() android.Paths

	ImplementationAndResourcesJars() android.Paths

}



type Dependency interface {

	ApexDependency

	ImplementationJars() android.Paths

	ResourceJars() android.Paths

	ImplementationAndResourcesJars() android.Paths

	DexJar() android.Path

	AidlIncludeDirs() android.Paths

	ExportedSdkLibs() []string

java/sdk_library.go

+20 −0
Original line number Diff line number Diff line
@@ -2005,6 +2005,26 @@ func (module *SdkLibraryImport) Stem() string { 
	return module.BaseModuleName()

}



var _ ApexDependency = (*SdkLibraryImport)(nil)



// to satisfy java.ApexDependency interface

func (module *SdkLibraryImport) HeaderJars() android.Paths {

	if module.implLibraryModule == nil {

		return nil

	} else {

		return module.implLibraryModule.HeaderJars()

	}

}



// to satisfy java.ApexDependency interface

func (module *SdkLibraryImport) ImplementationAndResourcesJars() android.Paths {

	if module.implLibraryModule == nil {

		return nil

	} else {

		return module.implLibraryModule.ImplementationAndResourcesJars()

	}

}



//

// java_sdk_library_xml

//