Support transitive dependencies through android_libary_import modules (81794967) · Commits · e / os / android_build_soong

java/aar.go

+62 −28

Original line number	Original line	Diff line number	Diff line
	@@ -386,11 +386,6 @@ func (a *aapt) buildActions(ctx android.ModuleContext, opts aaptBuildActionOptio
	// Add additional manifest files to transitive manifests.		// Add additional manifest files to transitive manifests.
	additionalManifests := android.PathsForModuleSrc(ctx, a.aaptProperties.Additional_manifests)		additionalManifests := android.PathsForModuleSrc(ctx, a.aaptProperties.Additional_manifests)
	transitiveManifestPaths := append(android.Paths{manifestPath}, additionalManifests...)		transitiveManifestPaths := append(android.Paths{manifestPath}, additionalManifests...)
	// TODO(b/288358614): Soong has historically not merged manifests from dependencies of android_library_import
	// modules. Merging manifests from dependencies could remove the need for pom2bp to generate the "-nodeps" copies
	// of androidx libraries, but doing so triggers errors due to errors introduced by existing dependencies of
	// android_library_import modules. If this is fixed, staticManifestsDepSet can be dropped completely in favor of
	// staticResourcesNodesDepSet.manifests()
	transitiveManifestPaths = append(transitiveManifestPaths, staticManifestsDepSet.ToList()...)		transitiveManifestPaths = append(transitiveManifestPaths, staticManifestsDepSet.ToList()...)

	if len(transitiveManifestPaths) > 1 && !Bool(a.aaptProperties.Dont_merge_manifests) {		if len(transitiveManifestPaths) > 1 && !Bool(a.aaptProperties.Dont_merge_manifests) {
	@@ -757,7 +752,8 @@ func aaptLibs(ctx android.ModuleContext, sdkContext android.SdkContext, classLoa
	// reverse later.		// reverse later.
	// NOTE: this is legacy and probably incorrect behavior, for most other cases (e.g. conflicting classes in		// NOTE: this is legacy and probably incorrect behavior, for most other cases (e.g. conflicting classes in
	// dependencies) the highest priority dependency is listed first, but for resources the highest priority		// dependencies) the highest priority dependency is listed first, but for resources the highest priority
	// dependency has to be listed last.		// dependency has to be listed last. This is also inconsistent with the way manifests from the same
			// transitive dependencies are merged.
	staticResourcesNodes = android.NewDepSet(android.TOPOLOGICAL, nil,		staticResourcesNodes = android.NewDepSet(android.TOPOLOGICAL, nil,
	android.ReverseSliceInPlace(staticResourcesNodeDepSets))		android.ReverseSliceInPlace(staticResourcesNodeDepSets))
	sharedResourcesNodes = android.NewDepSet(android.TOPOLOGICAL, nil,		sharedResourcesNodes = android.NewDepSet(android.TOPOLOGICAL, nil,
	@@ -972,7 +968,8 @@ type AARImport struct {

	properties AARImportProperties		properties AARImportProperties

	classpathFile android.WritablePath		headerJarFile android.WritablePath
			implementationJarFile android.WritablePath
	proguardFlags android.WritablePath		proguardFlags android.WritablePath
	exportPackage android.WritablePath		exportPackage android.WritablePath
	transitiveAaptResourcePackagesFile android.Path		transitiveAaptResourcePackagesFile android.Path
	@@ -993,6 +990,9 @@ type AARImport struct {
	sdkVersion android.SdkSpec		sdkVersion android.SdkSpec
	minSdkVersion android.ApiLevel		minSdkVersion android.ApiLevel

			usesLibrary
			classLoaderContexts dexpreopt.ClassLoaderContextMap

	// Single aconfig "cache file" merged from this module and all dependencies.		// Single aconfig "cache file" merged from this module and all dependencies.
	mergedAconfigFiles map[string]android.Paths		mergedAconfigFiles map[string]android.Paths
	}		}
	@@ -1005,7 +1005,7 @@ func (a *AARImport) OutputFiles(tag string) (android.Paths, error) {
	case ".aar":		case ".aar":
	return []android.Path{a.aarPath}, nil		return []android.Path{a.aarPath}, nil
	case "":		case "":
	return []android.Path{a.classpathFile}, nil		return []android.Path{a.implementationJarFile}, nil
	default:		default:
	return nil, fmt.Errorf("unsupported module reference tag %q", tag)		return nil, fmt.Errorf("unsupported module reference tag %q", tag)
	}		}
	@@ -1088,6 +1088,8 @@ func (a *AARImport) DepsMutator(ctx android.BottomUpMutatorContext) {

	ctx.AddVariationDependencies(nil, libTag, a.properties.Libs...)		ctx.AddVariationDependencies(nil, libTag, a.properties.Libs...)
	ctx.AddVariationDependencies(nil, staticLibTag, a.properties.Static_libs...)		ctx.AddVariationDependencies(nil, staticLibTag, a.properties.Static_libs...)

			a.usesLibrary.deps(ctx, false)
	}		}

	type JniPackageInfo struct {		type JniPackageInfo struct {
	@@ -1146,7 +1148,7 @@ func (a *AARImport) GenerateAndroidBuildActions(ctx android.ModuleContext) {
	}		}

	extractedAARDir := android.PathForModuleOut(ctx, "aar")		extractedAARDir := android.PathForModuleOut(ctx, "aar")
	a.classpathFile = extractedAARDir.Join(ctx, "classes-combined.jar")		classpathFile := extractedAARDir.Join(ctx, "classes-combined.jar")
	a.manifest = extractedAARDir.Join(ctx, "AndroidManifest.xml")		a.manifest = extractedAARDir.Join(ctx, "AndroidManifest.xml")
	a.rTxt = extractedAARDir.Join(ctx, "R.txt")		a.rTxt = extractedAARDir.Join(ctx, "R.txt")
	a.assetsPackage = android.PathForModuleOut(ctx, "assets.zip")		a.assetsPackage = android.PathForModuleOut(ctx, "assets.zip")
	@@ -1162,11 +1164,11 @@ func (a *AARImport) GenerateAndroidBuildActions(ctx android.ModuleContext) {
	ctx.Build(pctx, android.BuildParams{		ctx.Build(pctx, android.BuildParams{
	Rule: unzipAAR,		Rule: unzipAAR,
	Input: a.aarPath,		Input: a.aarPath,
	Outputs: android.WritablePaths{a.classpathFile, a.proguardFlags, a.manifest, a.assetsPackage, a.rTxt},		Outputs: android.WritablePaths{classpathFile, a.proguardFlags, a.manifest, a.assetsPackage, a.rTxt},
	Description: "unzip AAR",		Description: "unzip AAR",
	Args: map[string]string{		Args: map[string]string{
	"outDir": extractedAARDir.String(),		"outDir": extractedAARDir.String(),
	"combinedClassesJar": a.classpathFile.String(),		"combinedClassesJar": classpathFile.String(),
	"assetsPackage": a.assetsPackage.String(),		"assetsPackage": a.assetsPackage.String(),
	},		},
	})		})
	@@ -1239,13 +1241,7 @@ func (a *AARImport) GenerateAndroidBuildActions(ctx android.ModuleContext) {
	a.resourcesNodesDepSet = resourcesNodesDepSetBuilder.Build()		a.resourcesNodesDepSet = resourcesNodesDepSetBuilder.Build()

	manifestDepSetBuilder := android.NewDepSetBuilder[android.Path](android.TOPOLOGICAL).Direct(a.manifest)		manifestDepSetBuilder := android.NewDepSetBuilder[android.Path](android.TOPOLOGICAL).Direct(a.manifest)
	// TODO(b/288358614): Soong has historically not merged manifests from dependencies of android_library_import		manifestDepSetBuilder.Transitive(staticManifestsDepSet)
	// modules. Merging manifests from dependencies could remove the need for pom2bp to generate the "-nodeps" copies
	// of androidx libraries, but doing so triggers errors due to errors introduced by existing dependencies of
	// android_library_import modules. If this is fixed, AndroidLibraryDependency.ManifestsDepSet can be dropped
	// completely in favor of AndroidLibraryDependency.ResourceNodesDepSet.manifest
	//manifestDepSetBuilder.Transitive(transitiveStaticDeps.manifests)
	_ = staticManifestsDepSet
	a.manifestsDepSet = manifestDepSetBuilder.Build()		a.manifestsDepSet = manifestDepSetBuilder.Build()

	transitiveAaptResourcePackages := staticDeps.resPackages().Strings()		transitiveAaptResourcePackages := staticDeps.resPackages().Strings()
	@@ -1257,12 +1253,45 @@ func (a *AARImport) GenerateAndroidBuildActions(ctx android.ModuleContext) {
	a.transitiveAaptResourcePackagesFile = transitiveAaptResourcePackagesFile		a.transitiveAaptResourcePackagesFile = transitiveAaptResourcePackagesFile

	a.collectTransitiveHeaderJars(ctx)		a.collectTransitiveHeaderJars(ctx)

			a.classLoaderContexts = a.usesLibrary.classLoaderContextForUsesLibDeps(ctx)

			var staticJars android.Paths
			var staticHeaderJars android.Paths
			ctx.VisitDirectDeps(func(module android.Module) {
			if dep, ok := android.OtherModuleProvider(ctx, module, JavaInfoProvider); ok {
			tag := ctx.OtherModuleDependencyTag(module)
			switch tag {
			case staticLibTag:
			staticJars = append(staticJars, dep.ImplementationJars...)
			staticHeaderJars = append(staticHeaderJars, dep.HeaderJars...)
			}
			}
			addCLCFromDep(ctx, module, a.classLoaderContexts)
			})

			if len(staticJars) > 0 {
			combineJars := append(android.Paths{classpathFile}, staticJars...)
			a.implementationJarFile = android.PathForModuleOut(ctx, "combined", ctx.ModuleName()+".jar")
			TransformJarsToJar(ctx, a.implementationJarFile, "combine", combineJars, android.OptionalPath{}, false, nil, nil)
			} else {
			a.implementationJarFile = classpathFile
			}

			if len(staticHeaderJars) > 0 {
			combineJars := append(android.Paths{classpathFile}, staticHeaderJars...)
			a.headerJarFile = android.PathForModuleOut(ctx, "turbine-combined", ctx.ModuleName()+".jar")
			TransformJarsToJar(ctx, a.headerJarFile, "combine header jars", combineJars, android.OptionalPath{}, false, nil, nil)
			} else {
			a.headerJarFile = classpathFile
			}

	android.SetProvider(ctx, JavaInfoProvider, JavaInfo{		android.SetProvider(ctx, JavaInfoProvider, JavaInfo{
	HeaderJars: android.PathsIfNonNil(a.classpathFile),		HeaderJars: android.PathsIfNonNil(a.headerJarFile),
	TransitiveLibsHeaderJars: a.transitiveLibsHeaderJars,		TransitiveLibsHeaderJars: a.transitiveLibsHeaderJars,
	TransitiveStaticLibsHeaderJars: a.transitiveStaticLibsHeaderJars,		TransitiveStaticLibsHeaderJars: a.transitiveStaticLibsHeaderJars,
	ImplementationAndResourcesJars: android.PathsIfNonNil(a.classpathFile),		ImplementationAndResourcesJars: android.PathsIfNonNil(a.implementationJarFile),
	ImplementationJars: android.PathsIfNonNil(a.classpathFile),		ImplementationJars: android.PathsIfNonNil(a.implementationJarFile),
	StubsLinkType: Implementation,		StubsLinkType: Implementation,
	// TransitiveAconfigFiles: // TODO(b/289117800): LOCAL_ACONFIG_FILES for prebuilts		// TransitiveAconfigFiles: // TODO(b/289117800): LOCAL_ACONFIG_FILES for prebuilts
	})		})
	@@ -1295,15 +1324,15 @@ func (a *AARImport) GenerateAndroidBuildActions(ctx android.ModuleContext) {
	}		}

	func (a *AARImport) HeaderJars() android.Paths {		func (a *AARImport) HeaderJars() android.Paths {
	return android.Paths{a.classpathFile}		return android.Paths{a.headerJarFile}
	}		}

	func (a *AARImport) ImplementationAndResourcesJars() android.Paths {		func (a *AARImport) ImplementationAndResourcesJars() android.Paths {
	return android.Paths{a.classpathFile}		return android.Paths{a.implementationJarFile}
	}		}

	func (a *AARImport) DexJarBuildPath(ctx android.ModuleErrorfContext) android.Path {		func (a *AARImport) DexJarBuildPath(ctx android.ModuleErrorfContext) OptionalDexJarPath {
	return nil		return OptionalDexJarPath{}
	}		}

	func (a *AARImport) DexJarInstallPath() android.Path {		func (a *AARImport) DexJarInstallPath() android.Path {
	@@ -1311,9 +1340,11 @@ func (a *AARImport) DexJarInstallPath() android.Path {
	}		}

	func (a *AARImport) ClassLoaderContexts() dexpreopt.ClassLoaderContextMap {		func (a *AARImport) ClassLoaderContexts() dexpreopt.ClassLoaderContextMap {
	return nil		return a.classLoaderContexts
	}		}

			var _ UsesLibraryDependency = (*AARImport)(nil)

	var _ android.ApexModule = (*AARImport)(nil)		var _ android.ApexModule = (*AARImport)(nil)

	// Implements android.ApexModule		// Implements android.ApexModule
	@@ -1322,7 +1353,7 @@ func (a *AARImport) DepIsInSameApex(ctx android.BaseModuleContext, dep android.M
	}		}

	// Implements android.ApexModule		// Implements android.ApexModule
	func (g *AARImport) ShouldSupportSdkVersion(ctx android.BaseModuleContext,		func (a *AARImport) ShouldSupportSdkVersion(ctx android.BaseModuleContext,
	sdkVersion android.ApiLevel) error {		sdkVersion android.ApiLevel) error {
	return nil		return nil
	}		}
	@@ -1336,7 +1367,10 @@ var _ android.PrebuiltInterface = (*AARImport)(nil)
	func AARImportFactory() android.Module {		func AARImportFactory() android.Module {
	module := &AARImport{}		module := &AARImport{}

	module.AddProperties(&module.properties)		module.AddProperties(
			&module.properties,
			&module.usesLibrary.usesLibraryProperties,
			)

	android.InitPrebuiltModule(module, &module.properties.Aars)		android.InitPrebuiltModule(module, &module.properties.Aars)
	android.InitApexModule(module)		android.InitApexModule(module)

java/android_manifest_test.go

+2 −3

Original line number	Original line	Diff line number	Diff line
	@@ -92,10 +92,9 @@ func TestManifestMerger(t *testing.T) {
	"out/soong/.intermediates/transitive/android_common/manifest_fixer/AndroidManifest.xml",		"out/soong/.intermediates/transitive/android_common/manifest_fixer/AndroidManifest.xml",
	"transitive/AndroidManifest2.xml",		"transitive/AndroidManifest2.xml",
	"out/soong/.intermediates/transitive_import/android_common/aar/AndroidManifest.xml",		"out/soong/.intermediates/transitive_import/android_common/aar/AndroidManifest.xml",
			"out/soong/.intermediates/transitive_import_dep/android_common/aar/AndroidManifest.xml",
	"out/soong/.intermediates/direct_import/android_common/aar/AndroidManifest.xml",		"out/soong/.intermediates/direct_import/android_common/aar/AndroidManifest.xml",
	// TODO(b/288358614): Soong has historically not merged manifests from dependencies of		"out/soong/.intermediates/direct_import_dep/android_common/aar/AndroidManifest.xml",
	// android_library_import modules.

	},		},
	manifestMergerRule.Implicits)		manifestMergerRule.Implicits)
	}		}

java/androidmk.go

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -262,13 +262,13 @@ func (prebuilt *AARImport) AndroidMkEntries() []android.AndroidMkEntries {
	}		}
	return []android.AndroidMkEntries{android.AndroidMkEntries{		return []android.AndroidMkEntries{android.AndroidMkEntries{
	Class: "JAVA_LIBRARIES",		Class: "JAVA_LIBRARIES",
	OutputFile: android.OptionalPathForPath(prebuilt.classpathFile),		OutputFile: android.OptionalPathForPath(prebuilt.implementationJarFile),
	Include: "$(BUILD_SYSTEM)/soong_java_prebuilt.mk",		Include: "$(BUILD_SYSTEM)/soong_java_prebuilt.mk",
	ExtraEntries: []android.AndroidMkExtraEntriesFunc{		ExtraEntries: []android.AndroidMkExtraEntriesFunc{
	func(ctx android.AndroidMkExtraEntriesContext, entries *android.AndroidMkEntries) {		func(ctx android.AndroidMkExtraEntriesContext, entries *android.AndroidMkEntries) {
	entries.SetBool("LOCAL_UNINSTALLABLE_MODULE", true)		entries.SetBool("LOCAL_UNINSTALLABLE_MODULE", true)
	entries.SetPath("LOCAL_SOONG_HEADER_JAR", prebuilt.classpathFile)		entries.SetPath("LOCAL_SOONG_HEADER_JAR", prebuilt.headerJarFile)
	entries.SetPath("LOCAL_SOONG_CLASSES_JAR", prebuilt.classpathFile)		entries.SetPath("LOCAL_SOONG_CLASSES_JAR", prebuilt.implementationJarFile)
	entries.SetPath("LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE", prebuilt.exportPackage)		entries.SetPath("LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE", prebuilt.exportPackage)
	entries.SetPath("LOCAL_SOONG_TRANSITIVE_RES_PACKAGES", prebuilt.transitiveAaptResourcePackagesFile)		entries.SetPath("LOCAL_SOONG_TRANSITIVE_RES_PACKAGES", prebuilt.transitiveAaptResourcePackagesFile)
	entries.SetPath("LOCAL_SOONG_EXPORT_PROGUARD_FLAGS", prebuilt.proguardFlags)		entries.SetPath("LOCAL_SOONG_EXPORT_PROGUARD_FLAGS", prebuilt.proguardFlags)

java/app_test.go

+18 −18

Original line number	Original line	Diff line number	Diff line
	@@ -829,12 +829,12 @@ func TestAndroidResourceProcessor(t *testing.T) {
	"out/soong/.intermediates/default/java/android_stubs_current/android_common/turbine-combined/android_stubs_current.jar",		"out/soong/.intermediates/default/java/android_stubs_current/android_common/turbine-combined/android_stubs_current.jar",
	"out/soong/.intermediates/shared/android_common/turbine-combined/shared.jar",		"out/soong/.intermediates/shared/android_common/turbine-combined/shared.jar",
	"out/soong/.intermediates/direct/android_common/turbine-combined/direct.jar",		"out/soong/.intermediates/direct/android_common/turbine-combined/direct.jar",
	"out/soong/.intermediates/direct_import/android_common/aar/classes-combined.jar",		"out/soong/.intermediates/direct_import/android_common/turbine-combined/direct_import.jar",
	},		},
	appCombined: []string{		appCombined: []string{
	"out/soong/.intermediates/app/android_common/javac/app.jar",		"out/soong/.intermediates/app/android_common/javac/app.jar",
	"out/soong/.intermediates/direct/android_common/combined/direct.jar",		"out/soong/.intermediates/direct/android_common/combined/direct.jar",
	"out/soong/.intermediates/direct_import/android_common/aar/classes-combined.jar",		"out/soong/.intermediates/direct_import/android_common/combined/direct_import.jar",
	},		},

	directResources: nil,		directResources: nil,
	@@ -849,12 +849,12 @@ func TestAndroidResourceProcessor(t *testing.T) {
	directClasspath: []string{		directClasspath: []string{
	"out/soong/.intermediates/default/java/android_stubs_current/android_common/turbine-combined/android_stubs_current.jar",		"out/soong/.intermediates/default/java/android_stubs_current/android_common/turbine-combined/android_stubs_current.jar",
	"out/soong/.intermediates/transitive/android_common/turbine-combined/transitive.jar",		"out/soong/.intermediates/transitive/android_common/turbine-combined/transitive.jar",
	"out/soong/.intermediates/transitive_import/android_common/aar/classes-combined.jar",		"out/soong/.intermediates/transitive_import/android_common/turbine-combined/transitive_import.jar",
	},		},
	directCombined: []string{		directCombined: []string{
	"out/soong/.intermediates/direct/android_common/javac/direct.jar",		"out/soong/.intermediates/direct/android_common/javac/direct.jar",
	"out/soong/.intermediates/transitive/android_common/javac/transitive.jar",		"out/soong/.intermediates/transitive/android_common/javac/transitive.jar",
	"out/soong/.intermediates/transitive_import/android_common/aar/classes-combined.jar",		"out/soong/.intermediates/transitive_import/android_common/combined/transitive_import.jar",
	},		},

	transitiveResources: []string{"out/soong/.intermediates/transitive/android_common/aapt2/transitive/res/values_strings.arsc.flat"},		transitiveResources: []string{"out/soong/.intermediates/transitive/android_common/aapt2/transitive/res/values_strings.arsc.flat"},
	@@ -928,13 +928,13 @@ func TestAndroidResourceProcessor(t *testing.T) {
	"out/soong/.intermediates/app/android_common/busybox/R.jar",		"out/soong/.intermediates/app/android_common/busybox/R.jar",
	"out/soong/.intermediates/shared/android_common/turbine-combined/shared.jar",		"out/soong/.intermediates/shared/android_common/turbine-combined/shared.jar",
	"out/soong/.intermediates/direct/android_common/turbine-combined/direct.jar",		"out/soong/.intermediates/direct/android_common/turbine-combined/direct.jar",
	"out/soong/.intermediates/direct_import/android_common/aar/classes-combined.jar",		"out/soong/.intermediates/direct_import/android_common/turbine-combined/direct_import.jar",
	},		},
	appCombined: []string{		appCombined: []string{
	"out/soong/.intermediates/app/android_common/javac/app.jar",		"out/soong/.intermediates/app/android_common/javac/app.jar",
	"out/soong/.intermediates/app/android_common/busybox/R.jar",		"out/soong/.intermediates/app/android_common/busybox/R.jar",
	"out/soong/.intermediates/direct/android_common/combined/direct.jar",		"out/soong/.intermediates/direct/android_common/combined/direct.jar",
	"out/soong/.intermediates/direct_import/android_common/aar/classes-combined.jar",		"out/soong/.intermediates/direct_import/android_common/combined/direct_import.jar",
	},		},

	directResources: nil,		directResources: nil,