From c8fd1f1d3c233552fbc9f37e7011050bf0319553 Mon Sep 17 00:00:00 2001 From: Christoffer Adamsen Date: Mon, 6 Jan 2025 19:04:03 +0100 Subject: Enable R8 full mode in tests Bug: 215530220 Test: existing Change-Id: Ie9cd9d0485db3a9f46f6a6a55e0fdf44717a0d13 --- java/app.go | 2 ++ java/dex.go | 10 +++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'java') diff --git a/java/app.go b/java/app.go index b0dcbb003..73f63b41b 100644 --- a/java/app.go +++ b/java/app.go @@ -1735,6 +1735,8 @@ func AndroidTestHelperAppFactory() android.Module { // TODO(b/192032291): Disable by default after auditing downstream usage. module.Module.dexProperties.Optimize.EnabledByDefault = true + module.Module.dexProperties.Optimize.Ignore_library_extends_program = proptools.BoolPtr(true) + module.Module.dexProperties.Optimize.Proguard_compatibility = proptools.BoolPtr(false) module.Module.properties.Installable = proptools.BoolPtr(true) module.appProperties.Use_embedded_native_libs = proptools.BoolPtr(true) diff --git a/java/dex.go b/java/dex.go index 168a23114..7b99549d4 100644 --- a/java/dex.go +++ b/java/dex.go @@ -42,11 +42,15 @@ type DexProperties struct { // True if the module containing this has it set by default. EnabledByDefault bool `blueprint:"mutated"` + // Whether to allow that library classes inherit from program classes. + // Defaults to false. + Ignore_library_extends_program *bool + // Whether to continue building even if warnings are emitted. Defaults to true. Ignore_warnings *bool // If true, runs R8 in Proguard compatibility mode, otherwise runs R8 in full mode. - // Defaults to false for apps, true for libraries and tests. + // Defaults to false for apps and tests, true for libraries. Proguard_compatibility *bool // If true, optimize for size by removing unused code. Defaults to true for apps, @@ -356,6 +360,10 @@ func (d *dexer) r8Flags(ctx android.ModuleContext, dexParams *compileDexParams, r8Flags = append(r8Flags, opt.Proguard_flags...) + if BoolDefault(opt.Ignore_library_extends_program, false) { + r8Flags = append(r8Flags, "--ignore-library-extends-program") + } + if BoolDefault(opt.Proguard_compatibility, true) { r8Flags = append(r8Flags, "--force-proguard-compatibility") } -- cgit v1.2.3-59-g8ed1b