diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/aar.go | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/java/aar.go b/java/aar.go index 1e5c95a7f..b66876663 100644 --- a/java/aar.go +++ b/java/aar.go @@ -257,7 +257,7 @@ func (a *aapt) IsRROEnforced(ctx android.BaseModuleContext) bool { } func (a *aapt) aapt2Flags(ctx android.ModuleContext, sdkContext android.SdkContext, - manifestPath android.Path) (compileFlags, linkFlags []string, linkDeps android.Paths, + manifestPath android.Path, doNotIncludeAssetDirImplicitly bool) (compileFlags, linkFlags []string, linkDeps android.Paths, resDirs, overlayDirs []globbedResourceDir, rroDirs []rroDir, resZips android.Paths) { hasVersionCode := android.PrefixInList(a.aaptProperties.Aaptflags, "--version-code") @@ -274,7 +274,12 @@ func (a *aapt) aapt2Flags(ctx android.ModuleContext, sdkContext android.SdkConte Paths: a.aaptProperties.Assets, IncludeDirs: false, }) - assetDirs := android.PathsWithOptionalDefaultForModuleSrc(ctx, a.aaptProperties.Asset_dirs, "assets") + var assetDirs android.Paths + if doNotIncludeAssetDirImplicitly { + assetDirs = android.PathsForModuleSrc(ctx, a.aaptProperties.Asset_dirs) + } else { + assetDirs = android.PathsWithOptionalDefaultForModuleSrc(ctx, a.aaptProperties.Asset_dirs, "assets") + } resourceDirs := android.PathsWithOptionalDefaultForModuleSrc(ctx, a.aaptProperties.Resource_dirs.GetOrDefault(ctx, nil), "res") resourceZips := android.PathsForModuleSrc(ctx, a.aaptProperties.Resource_zips) @@ -494,7 +499,8 @@ func (a *aapt) buildActions(ctx android.ModuleContext, opts aaptBuildActionOptio a.mergedManifestFile = manifestPath } - compileFlags, linkFlags, linkDeps, resDirs, overlayDirs, rroDirs, resZips := a.aapt2Flags(ctx, opts.sdkContext, manifestPath) + // do not include assets in autogenerated RRO. + compileFlags, linkFlags, linkDeps, resDirs, overlayDirs, rroDirs, resZips := a.aapt2Flags(ctx, opts.sdkContext, manifestPath, opts.rroDirs != nil) a.rroDirsDepSet = depset.NewBuilder[rroDir](depset.TOPOLOGICAL). Direct(rroDirs...). |