summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Søren Gjesse <sgjesse@google.com> 2023-12-21 09:47:47 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2023-12-21 09:47:47 +0000
commitc97dfe42b9307deded482067f45da0f6cc1b81c6 (patch)
tree4186657e542324e80f7db075dce3da6125e70579
parent26d2c673395bef86047aef32cf1c80bdae969190 (diff)
parent8a5b32d0cf4f932fac0cadc73d5012ac33457d81 (diff)
Merge "Remove setting com.android.tools.r8.emitRecordAnnotationsExInDex" into main
-rw-r--r--java/config/config.go2
1 files changed, 0 insertions, 2 deletions
diff --git a/java/config/config.go b/java/config/config.go
index d80ed4142..6a945ac9c 100644
--- a/java/config/config.go
+++ b/java/config/config.go
@@ -95,13 +95,11 @@ func init() {
"-JXX:TieredStopAtLevel=1",
"-JDcom.android.tools.r8.emitRecordAnnotationsInDex",
"-JDcom.android.tools.r8.emitPermittedSubclassesAnnotationsInDex",
- "-JDcom.android.tools.r8.emitRecordAnnotationsExInDex",
}, dexerJavaVmFlagsList...))
exportedVars.ExportStringListStaticVariable("R8Flags", append([]string{
"-JXmx4096M",
"-JDcom.android.tools.r8.emitRecordAnnotationsInDex",
"-JDcom.android.tools.r8.emitPermittedSubclassesAnnotationsInDex",
- "-JDcom.android.tools.r8.emitRecordAnnotationsExInDex",
}, dexerJavaVmFlagsList...))
exportedVars.ExportStringListStaticVariable("CommonJdkFlags", []string{