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

Commit c8228181 authored by Baligh Uddin's avatar Baligh Uddin Committed by Gerrit Code Review
Browse files

Merge "Allow for overriding container packagename for an Apex."

parents cc868de8 5b57dbad

apex/apex.go

+4 −0
Original line number Diff line number Diff line
@@ -1353,6 +1353,10 @@ type overridableProperties struct { 


	// Logging Parent value

	Logging_parent string



	// Apex Container Package Name.

	// Override value for attribute package:name in AndroidManifest.xml

	Package_name string

}



type apexPackaging int

apex/apex_test.go

+2 −1
Original line number Diff line number Diff line
@@ -3664,6 +3664,7 @@ func TestOverrideApex(t *testing.T) { 
			apps: ["override_app"],

			overrides: ["unknownapex"],

			logging_parent: "com.foo.bar",

			package_name: "test.overridden.package",

		}



		apex_key {
@@ -3715,7 +3716,7 @@ func TestOverrideApex(t *testing.T) { 
	}



	optFlags := apexRule.Args["opt_flags"]

	ensureContains(t, optFlags, "--override_apk_package_name com.android.myapex")

	ensureContains(t, optFlags, "--override_apk_package_name test.overridden.package")



	data := android.AndroidMkDataForTest(t, config, "", apexBundle)

	var builder strings.Builder

apex/builder.go

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

		return ""

	}

	if a.overridableProperties.Package_name != "" {

		return a.overridableProperties.Package_name

	}

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

	if overridden {

		return manifestPackageName