diff options
| author | 2024-12-03 22:52:24 +0000 | |
|---|---|---|
| committer | 2024-12-03 22:52:24 +0000 | |
| commit | de588a30ac15d786c349c9a651bedb5207e1e07e (patch) | |
| tree | 4a201ca8a0ecf3a1c4c4d5c127a8ca1e343780fb /java/androidmk.go | |
| parent | e8ef6f1540ca7518e2e2998779b5f2d37b7a1479 (diff) | |
Revert^2 "Use soong built autogenerated RROs"
e8ef6f1540ca7518e2e2998779b5f2d37b7a1479
Change-Id: I0c563712da65c7bc4ef73633401cb5151cb49d3f
Diffstat (limited to 'java/androidmk.go')
| -rw-r--r-- | java/androidmk.go | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/java/androidmk.go b/java/androidmk.go index 2ad30b132..35024c1d6 100644 --- a/java/androidmk.go +++ b/java/androidmk.go @@ -307,15 +307,11 @@ 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, + Required: app.requiredModuleNames, ExtraEntries: []android.AndroidMkExtraEntriesFunc{ func(ctx android.AndroidMkExtraEntriesContext, entries *android.AndroidMkEntries) { // App module names can be overridden. @@ -350,31 +346,6 @@ func (app *AndroidApp) AndroidMkEntries() []android.AndroidMkEntries { entries.SetBoolIfTrue("LOCAL_NO_STANDARD_LIBRARIES", true) } - filterRRO := func(filter overlayType) android.Paths { - var paths android.Paths - seen := make(map[android.Path]bool) - for _, d := range app.rroDirsDepSet.ToList() { - if d.overlayType == filter { - if seen[d.path] { - continue - } - seen[d.path] = true - paths = append(paths, d.path) - } - } - // Reverse the order, Soong stores rroDirs in aapt2 order (low to high priority), but Make - // expects it in LOCAL_RESOURCE_DIRS order (high to low priority). - return android.ReversePaths(paths) - } - deviceRRODirs := filterRRO(device) - if len(deviceRRODirs) > 0 { - entries.AddStrings("LOCAL_SOONG_DEVICE_RRO_DIRS", deviceRRODirs.Strings()...) - } - productRRODirs := filterRRO(product) - if len(productRRODirs) > 0 { - entries.AddStrings("LOCAL_SOONG_PRODUCT_RRO_DIRS", productRRODirs.Strings()...) - } - entries.SetBoolIfTrue("LOCAL_EXPORT_PACKAGE_RESOURCES", Bool(app.appProperties.Export_package_resources)) entries.SetPath("LOCAL_FULL_MANIFEST_FILE", app.manifestPath) |