From 7e671297c7c4b99e0fa962524df3ea9a1e2ce85a Mon Sep 17 00:00:00 2001 From: Jeremy Meyer Date: Fri, 7 Oct 2022 18:21:34 +0000 Subject: Allow overriding rro category in override_runtime_resource_overlay Bug: 240322840 Test: unit tests Change-Id: I6b07cf57dc113e3805346e50ef9896471df9f53c --- java/rro.go | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'java/rro.go') diff --git a/java/rro.go b/java/rro.go index cd8c635ff..9d0667cf0 100644 --- a/java/rro.go +++ b/java/rro.go @@ -142,6 +142,10 @@ func (r *RuntimeResourceOverlay) GenerateAndroidBuildActions(ctx android.ModuleC aaptLinkFlags = append(aaptLinkFlags, "--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...) // 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. 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 { -- cgit v1.2.3-59-g8ed1b