Merge "Revert "Revert "Enable compact resource entries for aapt linking"""

This commit is contained in:
Eric Miao
2023-06-22 16:49:11 +00:00
committed by Android (Google) Code Review

View File

@@ -176,6 +176,7 @@ func (a *aapt) aapt2Flags(ctx android.ModuleContext, sdkContext android.SdkConte
linkFlags = append(linkFlags, a.aaptProperties.Aaptflags...) linkFlags = append(linkFlags, a.aaptProperties.Aaptflags...)
linkFlags = append(linkFlags, "--no-static-lib-packages") linkFlags = append(linkFlags, "--no-static-lib-packages")
linkFlags = append(linkFlags, "--enable-compact-entries")
// Find implicit or explicit asset and resource dirs // Find implicit or explicit asset and resource dirs
assetDirs := android.PathsWithOptionalDefaultForModuleSrc(ctx, a.aaptProperties.Asset_dirs, "assets") assetDirs := android.PathsWithOptionalDefaultForModuleSrc(ctx, a.aaptProperties.Asset_dirs, "assets")