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

Commit f299cbef authored by Paul Duffin's avatar Paul Duffin
Browse files

Replace javaLibrary with java.Dependency,android.Module 

Passes an additional android.Module parameter through to avoid having
to use javaLibrary interface.

Bug: 146586360
Test: m nothing
Merged-In: Ie533c16c753dc9c43171d0223953adea7b2b5ee6
Change-Id: Ie533c16c753dc9c43171d0223953adea7b2b5ee6
(cherry picked from commit 581bbbe8)
parent 0f27063a

apex/androidmk.go

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ func (a *apexBundle) androidMkForFiles(w io.Writer, apexBundleName, apexName, mo 
			fmt.Fprintln(w, "LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR :=", fi.jacocoReportClassesFile.String())

		}

		if fi.class == javaSharedLib {

			javaModule := fi.module.(javaLibrary)

			javaModule := fi.module.(java.Dependency)

			// soong_java_prebuilt.mk sets LOCAL_MODULE_SUFFIX := .jar  Therefore

			// we need to remove the suffix from LOCAL_MODULE_STEM, otherwise

			// we will have foo.jar.jar

apex/apex.go

+4 −10
Original line number Diff line number Diff line
@@ -1692,16 +1692,10 @@ func apexFileForShBinary(ctx android.BaseModuleContext, sh *android.ShBinary) ap 
	return af

}



// TODO(b/146586360): replace javaLibrary(in apex/apex.go) with java.Dependency

type javaLibrary interface {

	android.Module

	java.Dependency

}



func apexFileForJavaLibrary(ctx android.BaseModuleContext, lib javaLibrary) apexFile {

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

	dirInApex := "javalib"

	fileToCopy := lib.DexJar()

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

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

	af.jacocoReportClassesFile = lib.JacocoReportClassesFile()

	return af

}
@@ -1972,7 +1966,7 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) { 
				}

			case javaLibTag:

				if javaLib, ok := child.(*java.Library); ok {

					af := apexFileForJavaLibrary(ctx, javaLib)

					af := apexFileForJavaLibrary(ctx, javaLib, javaLib)

					if !af.Ok() {

						ctx.PropertyErrorf("java_libs", "%q is not configured to be compiled into dex", depName)

					} else {
@@ -1980,7 +1974,7 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) { 
						return true // track transitive dependencies

					}

				} else if sdkLib, ok := child.(*java.SdkLibrary); ok {

					af := apexFileForJavaLibrary(ctx, sdkLib)

					af := apexFileForJavaLibrary(ctx, sdkLib, sdkLib)

					if !af.Ok() {

						ctx.PropertyErrorf("java_libs", "%q is not configured to be compiled into dex", depName)

						return false