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

Commit 97479ccb authored by Tobias Thierer's avatar Tobias Thierer
Browse files

Desugar: allow reflection over internal APIs. 

Desugar reflects over internal APIs at runtime, using the
java.lang.invoke.MethodHandles.Lookup API.

On OpenJDK 9 toolchains, such reflection is only allowed
to packages to which the java.lang.invoke module is opened.

This CL adds an override to open the module to all unnamed
modules (i.e., to Desugar) when running Desugar.

Test: make checkbuild
      (with OpenJDK 8u45 toolchain on the PATH)
Test: make EXPERIMENTAL_USE_OPENJDK9=true checkbuild
      (with OpenJDK 9-ea toolchain on the PATH)

Bug: 38177295

Change-Id: I2cf74a96ea17366dd50b8d92af8e41e812247ef7
parent 53681310

core/definitions.mk

+2 −0
Original line number Diff line number Diff line
@@ -2531,6 +2531,7 @@ define codename-or-sdk-to-sdk 
$(if $(filter $(1),$(PLATFORM_VERSION_CODENAME)),10000,$(1))

endef



# --add-opens is required because desugar reflects via java.lang.invoke.MethodHandles.Lookup

define desugar-classes-jar

@echo Desugar: $@

@mkdir -p $(dir $@)
@@ -2538,6 +2539,7 @@ $(hide) rm -f $@ $@.tmp 
@rm -rf $(dir $@)/desugar_dumped_classes

@mkdir $(dir $@)/desugar_dumped_classes

$(hide) java \

    $(if $(EXPERIMENTAL_USE_OPENJDK9),--add-opens java.base/java.lang.invoke=ALL-UNNAMED,) \

    -Djdk.internal.lambda.dumpProxyClasses=$(abspath $(dir $@))/desugar_dumped_classes \

    -jar $(DESUGAR) \

    $(addprefix --bootclasspath_entry ,$(call desugar-bootclasspath,$(PRIVATE_BOOTCLASSPATH))) \