From cc9eee0af2c5168e6a3cf46bdd4f335e3dd01caf Mon Sep 17 00:00:00 2001 From: Sorin Basca Date: Tue, 13 Sep 2022 15:05:47 +0100 Subject: [PATCH 1/2] Emit record annotation Test: m Change-Id: Ic1aae5c8f9fbf46293dc7e97e2951be3f11f4bbb --- java/config/config.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/java/config/config.go b/java/config/config.go index 7c22076ae..b7c04bbe1 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{ From 40253904684adaf95dc9fcc17d8393cbdfd8d36c Mon Sep 17 00:00:00 2001 From: Sorin Basca Date: Tue, 13 Sep 2022 12:56:13 +0100 Subject: [PATCH 2/2] Allow java.lang.runtime in boot image Test: m Change-Id: Icb208bb235f9c6ac97492c54c32a3174982756ae --- scripts/check_boot_jars/package_allowed_list.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/check_boot_jars/package_allowed_list.txt b/scripts/check_boot_jars/package_allowed_list.txt index 08bd80cab..a5a4ec4ef 100644 --- a/scripts/check_boot_jars/package_allowed_list.txt +++ b/scripts/check_boot_jars/package_allowed_list.txt @@ -11,6 +11,7 @@ java\.lang\.annotation java\.lang\.invoke java\.lang\.ref java\.lang\.reflect +java\.lang\.runtime java\.math java\.net java\.nio