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

Commit 5b57dbad authored by Baligh Uddin's avatar Baligh Uddin
Browse files

Allow for overriding container packagename for an Apex. 

Test: go test ./... -test.v -run TestOverrideApex
BUG: 148198056
Change-Id: If49042a7acbf9f0dcb505664863d97805902e459
parent 8fed7d40

apex/apex.go

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




	// Logging Parent value

	// Logging Parent value

	Logging_parent string

	Logging_parent string



	// Apex Container Package Name.

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

	Package_name string

}

}





type apexPackaging int

type apexPackaging int

apex/apex_test.go

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

			apps: ["override_app"],

			overrides: ["unknownapex"],

			overrides: ["unknownapex"],

			logging_parent: "com.foo.bar",

			logging_parent: "com.foo.bar",

			package_name: "test.overridden.package",

		}

		}





		apex_key {

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

	}





	optFlags := apexRule.Args["opt_flags"]

	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)

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

	var builder strings.Builder

	var builder strings.Builder

apex/builder.go

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

		}

		return ""

		return ""

	}

	}

	if a.overridableProperties.Package_name != "" {

		return a.overridableProperties.Package_name

	}

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

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

	if overridden {

	if overridden {

		return manifestPackageName

		return manifestPackageName