Merge "Disable desugaring try-with-resources" am: 28794da1c0 am: e99de69665 am: d11b4bdd21
am: 31d4e4da36
Change-Id: Ic933753b50497ce903fd72030e00bd251dc4cafc
diff --git a/core/definitions.mk b/core/definitions.mk
index d2bc611..86bda9e 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -2535,6 +2535,7 @@
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 @@
$(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