diff options
Diffstat (limited to 'java/dex.go')
-rw-r--r-- | java/dex.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/java/dex.go b/java/dex.go index 64465a2de..1a61000f1 100644 --- a/java/dex.go +++ b/java/dex.go @@ -362,6 +362,11 @@ func (d *dexer) r8Flags(ctx android.ModuleContext, dexParams *compileDexParams, android.PathForSource(ctx, "build/make/core/proguard.flags"), } + if ctx.Config().UseR8GlobalCheckNotNullFlags() { + flagFiles = append(flagFiles, android.PathForSource(ctx, + "build/make/core/proguard/checknotnull.flags")) + } + flagFiles = append(flagFiles, d.extraProguardFlagsFiles...) // TODO(ccross): static android library proguard files |