summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
author Sorin Basca <sorinbasca@google.com> 2023-03-03 15:12:28 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2023-03-03 15:12:28 +0000
commit93bca1585e2c208f3a705f9a302649a339e906f7 (patch)
tree9ade36d74b86cf846b3f8fc6fa87b4d29df17560 /java
parent04a0ee54dee1d13fbff7f47842a6bc362a205baa (diff)
parent40253904684adaf95dc9fcc17d8393cbdfd8d36c (diff)
Merge changes from topic "java17-record-support"
* changes: Allow java.lang.runtime in boot image Emit record annotation
Diffstat (limited to 'java')
-rw-r--r--java/config/config.go2
1 files changed, 2 insertions, 0 deletions
diff --git a/java/config/config.go b/java/config/config.go
index 293eb9230..838d007a8 100644
--- a/java/config/config.go
+++ b/java/config/config.go
@@ -93,9 +93,11 @@ func init() {
"-JXmx4096M",
"-JXX:+TieredCompilation",
"-JXX:TieredStopAtLevel=1",
+ "-JDcom.android.tools.r8.emitRecordAnnotationsInDex",
}, dexerJavaVmFlagsList...))
exportedVars.ExportStringListStaticVariable("R8Flags", append([]string{
"-JXmx2048M",
+ "-JDcom.android.tools.r8.emitRecordAnnotationsInDex",
}, dexerJavaVmFlagsList...))
exportedVars.ExportStringListStaticVariable("CommonJdkFlags", []string{