diff options
Diffstat (limited to 'java/android_resources.go')
-rw-r--r-- | java/android_resources.go | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/java/android_resources.go b/java/android_resources.go index 47535d299..efd3e3dd0 100644 --- a/java/android_resources.go +++ b/java/android_resources.go @@ -44,10 +44,6 @@ func androidResourceGlob(ctx android.ModuleContext, dir android.Path) android.Pa type overlayGlobResult struct { dir string paths android.DirectorySortedPaths - - // Set to true of the product has selected that values in this overlay should not be moved to - // Runtime Resource Overlay (RRO) packages. - excludeFromRRO bool } const overlayDataKey = "overlayDataKey" @@ -69,10 +65,11 @@ func overlayResourceGlob(ctx android.ModuleContext, dir android.Path) (res []glo files := data.paths.PathsInDirectory(filepath.Join(data.dir, dir.String())) if len(files) > 0 { overlayModuleDir := android.PathForSource(ctx, data.dir, dir.String()) + // If enforce RRO is enabled for this module and this overlay is not in the // exclusion list, ignore the overlay. The list of ignored overlays will be // passed to Make to be turned into an RRO package. - if rroEnabled && !data.excludeFromRRO { + if rroEnabled && !ctx.Config().EnforceRROExcludedOverlay(overlayModuleDir.String()) { rroDirs = append(rroDirs, overlayModuleDir) } else { res = append(res, globbedResourceDir{ @@ -102,10 +99,6 @@ func (overlaySingleton) GenerateBuildActions(ctx android.SingletonContext) { var result overlayGlobResult result.dir = overlay - // Mark overlays that will not have Runtime Resource Overlays enforced on them - // based on the product config - result.excludeFromRRO = ctx.Config().EnforceRROExcludedOverlay(overlay) - files, err := ctx.GlobWithDeps(filepath.Join(overlay, "**/*"), androidResourceIgnoreFilenames) if err != nil { ctx.Errorf("failed to glob resource dir %q: %s", overlay, err.Error()) |