diff --git a/core/definitions.mk b/core/definitions.mk index d2bc6118e..86bda9ea5 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -2535,6 +2535,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 $@) @@ -2548,6 +2549,7 @@ $(hide) $(JAVA) \ $(addprefix --bootclasspath_entry ,$(call desugar-bootclasspath,$(PRIVATE_BOOTCLASSPATH))) \ $(addprefix --classpath_entry ,$(PRIVATE_ALL_JAVA_LIBRARIES)) \ --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