StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PRODUCT_MANIFEST_PACKAGE_NAME_OVERRIDES is applicable to override_apex

Browse Source 
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 a519c54dd3)
Change-Id: I2947e5c75369216a4bbce8749503236be86771c3
This commit is contained in:
Jiyong Park
2020-03-03 11:45:41 +09:00
parent 0ecf0b223f
commit 20bacabe0b
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apex/apex_test.go
View File

@@ -3325,7 +3325,7 @@ func TestOverrideApex(t *testing.T) {
base: "app", base: "app",
package_name: "bar", package_name: "bar",
} }
`) `, withManifestPackageNameOverrides([]string{"myapex:com.android.myapex"}))
originalVariant := ctx.ModuleForTests("myapex", "android_common_myapex_image").Module().(android.OverridableModule) originalVariant := ctx.ModuleForTests("myapex", "android_common_myapex_image").Module().(android.OverridableModule)
overriddenVariant := ctx.ModuleForTests("myapex", "android_common_override_myapex_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) 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) data := android.AndroidMkDataForTest(t, config, "", apexBundle)
var builder strings.Builder var builder strings.Builder
data.Custom(&builder, name, "TARGET_", "", data) data.Custom(&builder, name, "TARGET_", "", data)

2
apex/builder.go
View File

@@ -660,7 +660,7 @@ func (a *apexBundle) getOverrideManifestPackageName(ctx android.ModuleContext) s
} }
return "" return ""
} }
manifestPackageName, overridden := ctx.DeviceConfig().OverrideManifestPackageNameFor(a.Name()) manifestPackageName, overridden := ctx.DeviceConfig().OverrideManifestPackageNameFor(ctx.ModuleName())
if overridden { if overridden {
return manifestPackageName return manifestPackageName
} }