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

Commit 3458f60b authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Make the package_name property configurable" into main

parents 32325372 12f6ec9b

apex/apex.go

+1 −1
Original line number Diff line number Diff line
@@ -395,7 +395,7 @@ type overridableProperties struct { 


	// Apex Container package name. Override value for attribute package:name in

	// AndroidManifest.xml

	Package_name string

	Package_name proptools.Configurable[string]



	// A txt file containing list of files that are allowed to be included in this APEX.

	Allowed_files *string `android:"path"`

apex/builder.go

+3 −2
Original line number Diff line number Diff line
@@ -1074,8 +1074,9 @@ func (a *apexBundle) getOverrideManifestPackageName(ctx android.ModuleContext) s 
		}

		return ""

	}

	if a.overridableProperties.Package_name != "" {

		return a.overridableProperties.Package_name

	packageNameFromProp := a.overridableProperties.Package_name.GetOrDefault(ctx, "")

	if packageNameFromProp != "" {

		return packageNameFromProp

	}

	manifestPackageName, overridden := ctx.DeviceConfig().OverrideManifestPackageNameFor(ctx.ModuleName())

	if overridden {