diff options
| author | 2023-11-07 13:37:14 +0900 | |
|---|---|---|
| committer | 2023-11-17 11:15:32 +0900 | |
| commit | 34dc4cd73893d2e7019108640c89e3c3c74891c4 (patch) | |
| tree | 0f2b00a87982993905d623230e83454fc21f27a5 /java/androidmk.go | |
| parent | 5876a78543c010c39cb5cac291b607b06a72d44b (diff) | |
Add support for auto-generated characteristics RRO
Setting Generate_product_characteristics_rro will automatically generate
an RRO package which contains resources with
'product="{PRODUCT_CHARACTERISTICS}"'. The RRO package will be installed
to /product partition. The app will be compiled with '--product
default', making the app identical to all targets.
Motivation for this change is to minimize divergence of system.img.
Bug: 294799593
Test: boot and idmap2 dump
Change-Id: I1371f7410a1ecf337e1f73214b024af39aa6d57a
Diffstat (limited to 'java/androidmk.go')
| -rw-r--r-- | java/androidmk.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/java/androidmk.go b/java/androidmk.go index 97b303dfb..84f78c89b 100644 --- a/java/androidmk.go +++ b/java/androidmk.go @@ -343,10 +343,15 @@ func (app *AndroidApp) AndroidMkEntries() []android.AndroidMkEntries { Disabled: true, }} } + var required []string + if proptools.Bool(app.appProperties.Generate_product_characteristics_rro) { + required = []string{app.productCharacteristicsRROPackageName()} + } return []android.AndroidMkEntries{android.AndroidMkEntries{ Class: "APPS", OutputFile: android.OptionalPathForPath(app.outputFile), Include: "$(BUILD_SYSTEM)/soong_app_prebuilt.mk", + Required: required, ExtraEntries: []android.AndroidMkExtraEntriesFunc{ func(ctx android.AndroidMkExtraEntriesContext, entries *android.AndroidMkEntries) { // App module names can be overridden. |