Merge "Replace javaLibrary with java.Dependency,android.Module" into rvc-dev (c91aafb6) · Commits · e / os / android_build_soong

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
		@@ -1693,16 +1693,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
		}
		@@ -1973,7 +1967,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 {
		@@ -1981,7 +1975,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