commit 03768629406b08cafaef0e4e3fda3ffb07a36a55
author Colin Cross <ccross@android.com> Wed Oct 25 23:00:02 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Oct 25 23:00:02 2017 +0000
tree 7055420593d13c3b2ad001b71dcdc09fd6344c59
parent 083b644b63173aeef82c9d9a465f9ee3c414a39f
parent 532beef194075a990d531180be0eac0b911d8170

Merge "Revert "Desugar default methods if required"" am: 4d85d55e09 am: 0cd4496235
am: 532beef194

Change-Id: I1fef52e483d92cd12f895c277177a70ee9edcd51

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index 82c385f..7a8d9c1 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -2385,6 +2385,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 $@)
@@ -2397,7 +2398,8 @@
     -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