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

Merge "Allow overriding rro category in override_runtime_resource_overlay"

Browse Source
This commit is contained in:
Treehugger Robot
2022-10-07 22:39:26 +00:00
committed by Gerrit Code Review
parent 41a7fedd39 7e671297c7
commit 8e4a787ae7
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
java/rro.go
View File

@@ -142,6 +142,10 @@ func (r *RuntimeResourceOverlay) GenerateAndroidBuildActions(ctx android.ModuleC
aaptLinkFlags = append(aaptLinkFlags, aaptLinkFlags = append(aaptLinkFlags,
"--rename-overlay-target-package "+*r.overridableProperties.Target_package_name) "--rename-overlay-target-package "+*r.overridableProperties.Target_package_name)
} }
if r.overridableProperties.Category != nil {
aaptLinkFlags = append(aaptLinkFlags,
"--rename-overlay-category "+*r.overridableProperties.Category)
}
r.aapt.buildActions(ctx, r, nil, nil, false, aaptLinkFlags...) r.aapt.buildActions(ctx, r, nil, nil, false, aaptLinkFlags...)
// Sign the built package // Sign the built package
@@ -220,6 +224,9 @@ type OverridableRuntimeResourceOverlayProperties struct {
// the target package name of this overlay app. The target package name in the manifest file is used if one was not given. // the target package name of this overlay app. The target package name in the manifest file is used if one was not given.
Target_package_name *string Target_package_name *string
// the rro category of this overlay. The category in the manifest file is used if one was not given.
Category *string
} }
type OverrideRuntimeResourceOverlay struct { type OverrideRuntimeResourceOverlay struct {

4
java/rro_test.go
View File

@@ -201,6 +201,7 @@ func TestOverrideRuntimeResourceOverlay(t *testing.T) {
base: "foo_overlay", base: "foo_overlay",
package_name: "com.android.bar.overlay", package_name: "com.android.bar.overlay",
target_package_name: "com.android.bar", target_package_name: "com.android.bar",
category: "mycategory",
} }
`) `)
@@ -212,6 +213,7 @@ func TestOverrideRuntimeResourceOverlay(t *testing.T) {
targetVariant string targetVariant string
packageFlag string packageFlag string
targetPackageFlag string targetPackageFlag string
categoryFlag string
}{ }{
{ {
variantName: "android_common", variantName: "android_common",
@@ -228,6 +230,7 @@ func TestOverrideRuntimeResourceOverlay(t *testing.T) {
targetVariant: "android_common_bar", targetVariant: "android_common_bar",
packageFlag: "com.android.bar.overlay", packageFlag: "com.android.bar.overlay",
targetPackageFlag: "com.android.bar", targetPackageFlag: "com.android.bar",
categoryFlag: "mycategory",
}, },
} }
for _, expected := range expectedVariants { for _, expected := range expectedVariants {
@@ -249,6 +252,7 @@ func TestOverrideRuntimeResourceOverlay(t *testing.T) {
checkAapt2LinkFlag(t, aapt2Flags, "rename-manifest-package", expected.packageFlag) checkAapt2LinkFlag(t, aapt2Flags, "rename-manifest-package", expected.packageFlag)
checkAapt2LinkFlag(t, aapt2Flags, "rename-resources-package", "") checkAapt2LinkFlag(t, aapt2Flags, "rename-resources-package", "")
checkAapt2LinkFlag(t, aapt2Flags, "rename-overlay-target-package", expected.targetPackageFlag) checkAapt2LinkFlag(t, aapt2Flags, "rename-overlay-target-package", expected.targetPackageFlag)
checkAapt2LinkFlag(t, aapt2Flags, "rename-overlay-category", expected.categoryFlag)
} }
} }