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

Commit 20bacabe authored by Jiyong Park's avatar Jiyong Park
Browse files

PRODUCT_MANIFEST_PACKAGE_NAME_OVERRIDES is applicable to override_apex 

apex { name: "foo" }
override_apex { name: "override_foo", base:"foo" }

PRODUCT_MANIFEST_PACKAGE_NAME_OVERRIDES := foo:com.android.foo

Previously, the override was done only for the overridden package "foo",
but not for "override_foo". Fixing this issue by using ctx.ModuleName()
when finding the package name to use.

Exempt-From-Owner-Approval: cherry-pick from internal

Bug: 150645663
Test: m
Merged-In: I2947e5c75369216a4bbce8749503236be86771c3
(cherry picked from commit a519c54d)
Change-Id: I2947e5c75369216a4bbce8749503236be86771c3
parent 0ecf0b22

apex/apex_test.go

+4 −1
Original line number Diff line number Diff line
@@ -3325,7 +3325,7 @@ func TestOverrideApex(t *testing.T) { 
			base: "app",

			package_name: "bar",

		}

	`)

	`, withManifestPackageNameOverrides([]string{"myapex:com.android.myapex"}))



	originalVariant := ctx.ModuleForTests("myapex", "android_common_myapex_image").Module().(android.OverridableModule)

	overriddenVariant := ctx.ModuleForTests("myapex", "android_common_override_myapex_myapex_image").Module().(android.OverridableModule)
@@ -3353,6 +3353,9 @@ func TestOverrideApex(t *testing.T) { 
		t.Errorf("override_myapex should have logging parent (com.foo.bar), but was %q.", apexBundle.overridableProperties.Logging_parent)

	}



	optFlags := apexRule.Args["opt_flags"]

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



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

	var builder strings.Builder

	data.Custom(&builder, name, "TARGET_", "", data)

apex/builder.go

+1 −1
Original line number Diff line number Diff line
@@ -660,7 +660,7 @@ func (a *apexBundle) getOverrideManifestPackageName(ctx android.ModuleContext) s 
		}

		return ""

	}

	manifestPackageName, overridden := ctx.DeviceConfig().OverrideManifestPackageNameFor(a.Name())

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

	if overridden {

		return manifestPackageName

	}