diff options
Diffstat (limited to 'java/config/config.go')
| -rw-r--r-- | java/config/config.go | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/java/config/config.go b/java/config/config.go index 4c1c72393..87703d821 100644 --- a/java/config/config.go +++ b/java/config/config.go @@ -97,11 +97,19 @@ func init() { "-JDcom.android.tools.r8.emitRecordAnnotationsInDex", "-JDcom.android.tools.r8.emitPermittedSubclassesAnnotationsInDex", }, dexerJavaVmFlagsList...), " ")) - pctx.StaticVariable("R8Flags", strings.Join(append([]string{ - "-JXmx4096M", - "-JDcom.android.tools.r8.emitRecordAnnotationsInDex", - "-JDcom.android.tools.r8.emitPermittedSubclassesAnnotationsInDex", - }, dexerJavaVmFlagsList...), " ")) + + pctx.VariableFunc("R8Flags", func(ctx android.PackageVarContext) string { + r8flags := append([]string{ + "-JXmx4096M", + "-JDcom.android.tools.r8.emitRecordAnnotationsInDex", + "-JDcom.android.tools.r8.emitPermittedSubclassesAnnotationsInDex", + }, dexerJavaVmFlagsList...) + if r8DumpDir := ctx.Config().Getenv("R8_DUMP_DIRECTORY"); r8DumpDir != "" { + r8flags = append(r8flags, "-JDcom.android.tools.r8.dumpinputtodirectory="+r8DumpDir) + } + return strings.Join(r8flags, " ") + + }) pctx.StaticVariable("CommonJdkFlags", strings.Join([]string{ `-Xmaxerrs 9999999`, |