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

Commit ea1fcb63 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

PRODUCT_MANIFEST_PACKAGE_NAME_OVERRIDES is applicable to override_apex am: 20bacabe 

Change-Id: Ia1255de0c065be74bfa4be7d88a19800be2e603c
parents fff0ad20 20bacabe

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

	}