Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 93bca158 authored by Sorin Basca's avatar Sorin Basca Committed by Gerrit Code Review
Browse files

Merge changes from topic "java17-record-support" 

* changes:
  Allow java.lang.runtime in boot image
  Emit record annotation
parents 04a0ee54 40253904

java/config/config.go

+2 −0
Original line number Diff line number Diff line
@@ -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{

scripts/check_boot_jars/package_allowed_list.txt

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ java\.lang\.constant 
java\.lang\.invoke

java\.lang\.ref

java\.lang\.reflect

java\.lang\.runtime

java\.math

java\.net

java\.nio