From 7ea054e6b44405c860d298800e476e504b06683d Mon Sep 17 00:00:00 2001 From: Inseob Kim Date: Mon, 5 Feb 2024 17:53:47 +0900 Subject: Use RRO for product-specific resources Currently CompanionDeviceManager is compiled and linked with the argument '--product {PRODUCT_CHARACTERISTICS}' to select product-specific resources. But that causes the app to depend on the product characteristics, making differences of system.img among targets. Setting generate_product_characteristics_rro will automatically generate an RRO package which contains resources having product="{PRODUCT_CHARACTERISTICS}"'. The RRO package will be installed to /product partition. CompanionDeviceManager will be compiled with '--product default', making system.img identical to all targets. Bug: 322932641 Test: TH Change-Id: I0677e2e6c435ae9cfc4141c1ba7d569e3579ff69 --- packages/CompanionDeviceManager/Android.bp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/CompanionDeviceManager/Android.bp b/packages/CompanionDeviceManager/Android.bp index f6458c26f309..ce32ec4321dc 100644 --- a/packages/CompanionDeviceManager/Android.bp +++ b/packages/CompanionDeviceManager/Android.bp @@ -46,4 +46,6 @@ android_app { ], platform_apis: true, + + generate_product_characteristics_rro: true, } -- cgit v1.2.3-59-g8ed1b