commit 4c764abf37b257dd3519f297c1dd4b56a568e01d
author Tobias Thierer <tobiast@google.com> Thu May 18 14:00:16 2017 +0000
committer Tobias Thierer <tobiast@google.com> Thu May 18 14:00:29 2017 +0000
tree 1e30014ceb033151ed0be4a9556c037c74058241
parent e2a8da26833be50489a82fed87d0896bd3496709

Revert "build/make/core: Fix fragile assumptions about build toolchain."

This reverts commit e2a8da26833be50489a82fed87d0896bd3496709.

Reason for revert: broke build. 

Change-Id: I951cc070adbbbd784aa4f8e171e543c35d0249de

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index 705eabd..10d26c4 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -2535,12 +2535,7 @@
 @echo Desugar: $@
 @mkdir -p $(dir $@)
 $(hide) rm -f $@ $@.tmp
-@rm -rf $(dir $@)/desugar_dumped_classes
-@mkdir $(dir $@)/desugar_dumped_classes
-$(hide) java \
-    --add-opens java.base/java.lang.invoke=ALL-UNNAMED \
-    -Djdk.internal.lambda.dumpProxyClasses=$(dir $@)/desugar_dumped_classes \
-    -jar $(DESUGAR) \
+$(hide) java -jar $(DESUGAR) \
     $(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)) \