Merge "Don't add dexpreopt compat deps to android_library modules" (bb258f4a) · Commits · e / os / android_build_soong

java/aar.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -525,7 +525,7 @@ func (a *AndroidLibrary) DepsMutator(ctx android.BottomUpMutatorContext) {
		if sdkDep.hasFrameworkLibs() {
		a.aapt.deps(ctx, sdkDep)
		}
		a.usesLibrary.deps(ctx, sdkDep.hasFrameworkLibs())
		a.usesLibrary.deps(ctx, false)
		}

		func (a *AndroidLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext) {

+4 −4

Original line number	Diff line number	Diff line
		@@ -1295,14 +1295,14 @@ func (u *usesLibrary) addLib(lib string, optional bool) {
		}
		}

		func (u *usesLibrary) deps(ctx android.BottomUpMutatorContext, hasFrameworkLibs bool) {
		func (u *usesLibrary) deps(ctx android.BottomUpMutatorContext, addCompatDeps bool) {
		if !ctx.Config().UnbundledBuild() \|\| ctx.Config().UnbundledBuildImage() {
		ctx.AddVariationDependencies(nil, usesLibReqTag, u.usesLibraryProperties.Uses_libs...)
		ctx.AddVariationDependencies(nil, usesLibOptTag, u.presentOptionalUsesLibs(ctx)...)
		// Only add these extra dependencies if the module depends on framework libs. This avoids
		// creating a cyclic dependency:
		// Only add these extra dependencies if the module is an app that depends on framework
		// libs. This avoids creating a cyclic dependency:
		// e.g. framework-res -> org.apache.http.legacy -> ... -> framework-res.
		if hasFrameworkLibs {
		if addCompatDeps {
		// Dexpreopt needs paths to the dex jars of these libraries in order to construct
		// class loader context for dex2oat. Add them as a dependency with a special tag.
		ctx.AddVariationDependencies(nil, usesLibCompat29ReqTag, dexpreopt.CompatUsesLibs29...)