Merge "Support setting R8 dump directory with environment variable" into main (46694ccb) · Commits · e / os / android_build_soong

java/config/config.go

+13 −5

Original line number	Diff line number	Diff line
		@@ -97,11 +97,19 @@ func init() {
		"-JDcom.android.tools.r8.emitRecordAnnotationsInDex",
		"-JDcom.android.tools.r8.emitPermittedSubclassesAnnotationsInDex",
		}, dexerJavaVmFlagsList...), " "))
		pctx.StaticVariable("R8Flags", strings.Join(append([]string{

		pctx.VariableFunc("R8Flags", func(ctx android.PackageVarContext) string {
		r8flags := append([]string{
		"-JXmx4096M",
		"-JDcom.android.tools.r8.emitRecordAnnotationsInDex",
		"-JDcom.android.tools.r8.emitPermittedSubclassesAnnotationsInDex",
		}, dexerJavaVmFlagsList...), " "))
		}, 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`,