diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/aapt2.go | 3 | ||||
| -rw-r--r-- | java/aar.go | 2 | ||||
| -rw-r--r-- | java/config/droidstubs.go | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/java/aapt2.go b/java/aapt2.go index 445e91298..f704fc6fc 100644 --- a/java/aapt2.go +++ b/java/aapt2.go @@ -309,7 +309,8 @@ func aapt2ExtractExtraPackages(ctx android.ModuleContext, out android.WritablePa var aapt2ConvertRule = pctx.AndroidStaticRule("aapt2Convert", blueprint.RuleParams{ - Command: `${config.Aapt2Cmd} convert --output-format $format $in -o $out`, + Command: `${config.Aapt2Cmd} convert --enable-compact-entries ` + + `--output-format $format $in -o $out`, CommandDeps: []string{"${config.Aapt2Cmd}"}, }, "format", ) diff --git a/java/aar.go b/java/aar.go index 54fca819a..27dd38b3f 100644 --- a/java/aar.go +++ b/java/aar.go @@ -204,6 +204,8 @@ func (a *aapt) aapt2Flags(ctx android.ModuleContext, sdkContext android.SdkConte // Flags specified in Android.bp linkFlags = append(linkFlags, a.aaptProperties.Aaptflags...) + linkFlags = append(linkFlags, "--enable-compact-entries") + // Find implicit or explicit asset and resource dirs assets := android.PathsRelativeToModuleSourceDir(android.SourceInput{ Context: ctx, diff --git a/java/config/droidstubs.go b/java/config/droidstubs.go index f46c893fd..39eec444c 100644 --- a/java/config/droidstubs.go +++ b/java/config/droidstubs.go @@ -23,7 +23,6 @@ var ( "--format=v2", "--repeat-errors-max 10", "--hide UnresolvedImport", - "--hide InvalidNullabilityOverride", // Force metalava to ignore classes on the classpath when an API file contains missing classes. // See b/285140653 for more information. @@ -49,9 +48,6 @@ var ( // TODO(tnorbye): find owners to fix these warnings when annotation was enabled. "--hide HiddenTypedefConstant", "--hide SuperfluousPrefix", - "--hide AnnotationExtraction", - // b/222738070 - "--hide BannedThrow", } MetalavaAnnotationsWarningsFlags = strings.Join(metalavaAnnotationsWarningsFlags, " ") |