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

Commit 53aa02d2 authored by Colin Cross's avatar Colin Cross
Browse files

Revert "Desugar default methods if required" 

This reverts commit 6548d2a9.

Reason for revert: broke apps build

Change-Id: Ibc503fa89b51e1f64f78cb6cee3e3ad7bbd8f2eb
parent 6548d2a9

core/definitions.mk

+3 −1
Original line number Diff line number Diff line
@@ -2385,6 +2385,7 @@ $(if $(filter $(1),$(PLATFORM_VERSION_CODENAME)),10000,$(1)) 
endef



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

# --desugar_try_with_resources_if_needed=false is needed due to b/63180735, b/63901645, b/63900665

define desugar-classes-jar

@echo Desugar: $@

@mkdir -p $(dir $@)
@@ -2397,7 +2398,8 @@ $(hide) $(JAVA) \ 
    -jar $(DESUGAR) \

    $(addprefix --bootclasspath_entry ,$(PRIVATE_BOOTCLASSPATH)) \

    $(addprefix --classpath_entry ,$(PRIVATE_ALL_JAVA_HEADER_LIBRARIES)) \

    --min_sdk_version $(call codename-or-sdk-to-sdk,$(PRIVATE_MIN_SDK_VERSION)) \

    --min_sdk_version $(call codename-or-sdk-to-sdk,$(PRIVATE_DEFAULT_APP_TARGET_SDK)) \

    --desugar_try_with_resources_if_needed=false \

    --allow_empty_bootclasspath \

    $(if $(filter --core-library,$(PRIVATE_DX_FLAGS)),--core_library) \

    -i $< -o $@.tmp