commit 93bca1585e2c208f3a705f9a302649a339e906f7
author Sorin Basca <sorinbasca@google.com> Fri Mar 03 15:12:28 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 03 15:12:28 2023 +0000
tree 9ade36d74b86cf846b3f8fc6fa87b4d29df17560
parent 04a0ee54dee1d13fbff7f47842a6bc362a205baa
parent 40253904684adaf95dc9fcc17d8393cbdfd8d36c

Merge changes from topic "java17-record-support"

* changes:
  Allow java.lang.runtime in boot image
  Emit record annotation

java/config/config.go

diff --git a/java/config/config.go b/java/config/config.go
index 293eb92..838d007 100644
--- a/java/config/config.go
+++ b/java/config/config.go
@@ -93,9 +93,11 @@
 		"-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{

scripts/check_boot_jars/package_allowed_list.txt

diff --git a/scripts/check_boot_jars/package_allowed_list.txt b/scripts/check_boot_jars/package_allowed_list.txt
index ce461b1..869fd3f 100644
--- a/scripts/check_boot_jars/package_allowed_list.txt
+++ b/scripts/check_boot_jars/package_allowed_list.txt
@@ -12,6 +12,7 @@
 java\.lang\.invoke
 java\.lang\.ref
 java\.lang\.reflect
+java\.lang\.runtime
 java\.math
 java\.net
 java\.nio