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

Commit 79de2a5e authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Make uses_libs and optional_uses_libs configurable" into main

parents b9ba4458 64f2d844

java/app.go

+14 −14
Original line number Diff line number Diff line
@@ -678,7 +678,7 @@ func (a *AndroidApp) dexBuildActions(ctx android.ModuleContext) (android.Path, a 
		a.dexProperties.Uncompress_dex = proptools.BoolPtr(a.shouldUncompressDex(ctx))

	}

	a.dexpreopter.uncompressedDex = *a.dexProperties.Uncompress_dex

	a.dexpreopter.enforceUsesLibs = a.usesLibrary.enforceUsesLibraries()

	a.dexpreopter.enforceUsesLibs = a.usesLibrary.enforceUsesLibraries(ctx)

	a.dexpreopter.classLoaderContexts = a.classLoaderContexts

	a.dexpreopter.manifestFile = a.mergedManifestFile

	a.dexpreopter.preventInstall = a.appProperties.PreventInstall
@@ -907,10 +907,10 @@ func (a *AndroidApp) generateAndroidBuildActions(ctx android.ModuleContext) { 
	// Process all building blocks, from AAPT to certificates.

	a.aaptBuildActions(ctx)

	// The decision to enforce <uses-library> checks is made before adding implicit SDK libraries.

	a.usesLibrary.freezeEnforceUsesLibraries()

	a.usesLibrary.freezeEnforceUsesLibraries(ctx)



	// Check that the <uses-library> list is coherent with the manifest.

	if a.usesLibrary.enforceUsesLibraries() {

	if a.usesLibrary.enforceUsesLibraries(ctx) {

		manifestCheckFile := a.usesLibrary.verifyUsesLibrariesManifest(

			ctx, a.mergedManifestFile, &a.classLoaderContexts)

		apkDeps = append(apkDeps, manifestCheckFile)
@@ -1686,11 +1686,11 @@ func OverrideAndroidTestModuleFactory() android.Module { 


type UsesLibraryProperties struct {

	// A list of shared library modules that will be listed in uses-library tags in the AndroidManifest.xml file.

	Uses_libs []string

	Uses_libs proptools.Configurable[[]string]



	// A list of shared library modules that will be listed in uses-library tags in the AndroidManifest.xml file with

	// required=false.

	Optional_uses_libs []string

	Optional_uses_libs proptools.Configurable[[]string]



	// If true, the list of uses_libs and optional_uses_libs modules must match the AndroidManifest.xml file.  Defaults

	// to true if either uses_libs or optional_uses_libs is set.  Will unconditionally default to true in the future.
@@ -1738,7 +1738,7 @@ type usesLibrary struct { 


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, usesLibReqTag, u.usesLibraryProperties.Uses_libs.GetOrDefault(ctx, nil)...)

		presentOptionalUsesLibs := u.presentOptionalUsesLibs(ctx)

		ctx.AddVariationDependencies(nil, usesLibOptTag, presentOptionalUsesLibs...)

		// Only add these extra dependencies if the module is an app that depends on framework
@@ -1751,17 +1751,17 @@ func (u *usesLibrary) deps(ctx android.BottomUpMutatorContext, addCompatDeps boo 
			ctx.AddVariationDependencies(nil, usesLibCompat28OptTag, dexpreopt.OptionalCompatUsesLibs28...)

			ctx.AddVariationDependencies(nil, usesLibCompat30OptTag, dexpreopt.OptionalCompatUsesLibs30...)

		}

		_, diff, _ := android.ListSetDifference(u.usesLibraryProperties.Optional_uses_libs, presentOptionalUsesLibs)

		_, diff, _ := android.ListSetDifference(u.usesLibraryProperties.Optional_uses_libs.GetOrDefault(ctx, nil), presentOptionalUsesLibs)

		u.usesLibraryProperties.Missing_optional_uses_libs = diff

	} else {

		ctx.AddVariationDependencies(nil, r8LibraryJarTag, u.usesLibraryProperties.Uses_libs...)

		ctx.AddVariationDependencies(nil, r8LibraryJarTag, u.usesLibraryProperties.Uses_libs.GetOrDefault(ctx, nil)...)

		ctx.AddVariationDependencies(nil, r8LibraryJarTag, u.presentOptionalUsesLibs(ctx)...)

	}

}



// presentOptionalUsesLibs returns optional_uses_libs after filtering out libraries that don't exist in the source tree.

func (u *usesLibrary) presentOptionalUsesLibs(ctx android.BaseModuleContext) []string {

	optionalUsesLibs := android.FilterListPred(u.usesLibraryProperties.Optional_uses_libs, func(s string) bool {

	optionalUsesLibs := android.FilterListPred(u.usesLibraryProperties.Optional_uses_libs.GetOrDefault(ctx, nil), func(s string) bool {

		exists := ctx.OtherModuleExists(s)

		if !exists && !android.InList(ctx.ModuleName(), ctx.Config().BuildWarningBadOptionalUsesLibsAllowlist()) {

			fmt.Printf("Warning: Module '%s' depends on non-existing optional_uses_libs '%s'\n", ctx.ModuleName(), s)
@@ -1827,15 +1827,15 @@ func (u *usesLibrary) classLoaderContextForUsesLibDeps(ctx android.ModuleContext 
// enforceUsesLibraries returns true of <uses-library> tags should be checked against uses_libs and optional_uses_libs

// properties.  Defaults to true if either of uses_libs or optional_uses_libs is specified.  Will default to true

// unconditionally in the future.

func (u *usesLibrary) enforceUsesLibraries() bool {

	defaultEnforceUsesLibs := len(u.usesLibraryProperties.Uses_libs) > 0 ||

		len(u.usesLibraryProperties.Optional_uses_libs) > 0

func (u *usesLibrary) enforceUsesLibraries(ctx android.ModuleContext) bool {

	defaultEnforceUsesLibs := len(u.usesLibraryProperties.Uses_libs.GetOrDefault(ctx, nil)) > 0 ||

		len(u.usesLibraryProperties.Optional_uses_libs.GetOrDefault(ctx, nil)) > 0

	return BoolDefault(u.usesLibraryProperties.Enforce_uses_libs, u.enforce || defaultEnforceUsesLibs)

}



// Freeze the value of `enforce_uses_libs` based on the current values of `uses_libs` and `optional_uses_libs`.

func (u *usesLibrary) freezeEnforceUsesLibraries() {

	enforce := u.enforceUsesLibraries()

func (u *usesLibrary) freezeEnforceUsesLibraries(ctx android.ModuleContext) {

	enforce := u.enforceUsesLibraries(ctx)

	u.usesLibraryProperties.Enforce_uses_libs = &enforce

}

java/app_import.go

+2 −2
Original line number Diff line number Diff line
@@ -364,13 +364,13 @@ func (a *AndroidAppImport) generateAndroidBuildActions(ctx android.ModuleContext 
	a.dexpreopter.isPresignedPrebuilt = Bool(a.properties.Presigned)

	a.dexpreopter.uncompressedDex = a.shouldUncompressDex(ctx)



	a.dexpreopter.enforceUsesLibs = a.usesLibrary.enforceUsesLibraries()

	a.dexpreopter.enforceUsesLibs = a.usesLibrary.enforceUsesLibraries(ctx)

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

	if a.usesLibrary.shouldDisableDexpreopt {

		a.dexpreopter.disableDexpreopt()

	}



	if a.usesLibrary.enforceUsesLibraries() {

	if a.usesLibrary.enforceUsesLibraries(ctx) {

		a.usesLibrary.verifyUsesLibrariesAPK(ctx, srcApk, &a.dexpreopter.classLoaderContexts)

	}

java/base.go

+1 −1
Original line number Diff line number Diff line
@@ -862,7 +862,7 @@ func (j *Module) deps(ctx android.BottomUpMutatorContext) { 
					// explicitly listed in the optional_uses_libs property.

					tag := usesLibReqTag

					if android.InList(*lib, dexpreopt.OptionalCompatUsesLibs) ||

						android.InList(*lib, j.usesLibrary.usesLibraryProperties.Optional_uses_libs) {

						android.InList(*lib, j.usesLibrary.usesLibraryProperties.Optional_uses_libs.GetOrDefault(ctx, nil)) {

						tag = usesLibOptTag

					}

					ctx.AddVariationDependencies(nil, tag, *lib)

java/java.go

+1 −1
Original line number Diff line number Diff line
@@ -3343,7 +3343,7 @@ func addCLCFromDep(ctx android.ModuleContext, depModule android.Module, 
	if sdkLib != nil {

		optional := false

		if module, ok := ctx.Module().(ModuleWithUsesLibrary); ok {

			if android.InList(*sdkLib, module.UsesLibrary().usesLibraryProperties.Optional_uses_libs) {

			if android.InList(*sdkLib, module.UsesLibrary().usesLibraryProperties.Optional_uses_libs.GetOrDefault(ctx, nil)) {

				optional = true

			}

		}

java/sdk_library_internal.go

+4 −4
Original line number Diff line number Diff line
@@ -566,7 +566,7 @@ func (module *SdkLibrary) createXmlFile(mctx android.DefaultableHookContext) { 
		Min_device_sdk            *string

		Max_device_sdk            *string

		Sdk_library_min_api_level *string

		Uses_libs_dependencies    []string

		Uses_libs_dependencies    proptools.Configurable[[]string]

	}{

		Name:                      proptools.StringPtr(module.xmlPermissionsModuleName()),

		Enabled:                   module.EnabledProperty(),
@@ -577,7 +577,7 @@ func (module *SdkLibrary) createXmlFile(mctx android.DefaultableHookContext) { 
		Min_device_sdk:            module.commonSdkLibraryProperties.Min_device_sdk,

		Max_device_sdk:            module.commonSdkLibraryProperties.Max_device_sdk,

		Sdk_library_min_api_level: &moduleMinApiLevelStr,

		Uses_libs_dependencies:    module.usesLibraryProperties.Uses_libs,

		Uses_libs_dependencies:    module.usesLibraryProperties.Uses_libs.Clone(),

	}



	mctx.CreateModule(sdkLibraryXmlFactory, &props)
@@ -742,7 +742,7 @@ type sdkLibraryXmlProperties struct { 
	// Uses-libs dependencies that the shared library requires to work correctly.

	//

	// This will add dependency="foo:bar" to the <library> section.

	Uses_libs_dependencies []string

	Uses_libs_dependencies proptools.Configurable[[]string]

}



// java_sdk_library_xml builds the permission xml file for a java_sdk_library.
@@ -864,7 +864,7 @@ func (module *sdkLibraryXml) permissionsContents(ctx android.ModuleContext) stri 
	implicitUntilAttr := formattedOptionalSdkLevelAttribute(ctx, "on-bootclasspath-before", module.properties.On_bootclasspath_before)

	minSdkAttr := formattedOptionalSdkLevelAttribute(ctx, "min-device-sdk", module.properties.Min_device_sdk)

	maxSdkAttr := formattedOptionalSdkLevelAttribute(ctx, "max-device-sdk", module.properties.Max_device_sdk)

	dependenciesAttr := formattedDependenciesAttribute(module.properties.Uses_libs_dependencies)

	dependenciesAttr := formattedDependenciesAttribute(module.properties.Uses_libs_dependencies.GetOrDefault(ctx, nil))

	// <library> is understood in all android versions whereas <apex-library> is only understood from API T (and ignored before that).

	// similarly, min_device_sdk is only understood from T. So if a library is using that, we need to use the apex-library to make sure this library is not loaded before T

	var libraryTag string