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

Merge "PRODUCT_MANIFEST_PACKAGE_NAME_OVERRIDES is applicable to override_apex" into rvc-dev

Browse Source
This commit is contained in:
Jiyong Park
2020-03-04 02:50:48 +00:00
committed by Android (Google) Code Review
parent 092c245c14 a519c54dd3
commit e95000a35e
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

@@ -3272,7 +3272,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)
@@ -3300,6 +3300,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

@@ -650,7 +650,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
} }