From 4c764abf37b257dd3519f297c1dd4b56a568e01d Mon Sep 17 00:00:00 2001
From: Tobias Thierer <tobiast@google.com>
Date: Thu, 18 May 2017 14:00:16 +0000
Subject: [PATCH] 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 | 7 +------
 core/droiddoc.mk    | 1 -
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/core/definitions.mk b/core/definitions.mk
index 705eabd7f..10d26c45c 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -2535,12 +2535,7 @@ define desugar-classes-jar
 @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)) \
diff --git a/core/droiddoc.mk b/core/droiddoc.mk
index 93d555169..a70ab0341 100644
--- a/core/droiddoc.mk
+++ b/core/droiddoc.mk
@@ -175,7 +175,6 @@ $(full_target): \
 	$(hide) ( \
 		javadoc \
                 -encoding UTF-8 \
-                -source 1.8 \
                 \@$(PRIVATE_SRC_LIST_FILE) \
                 -J-Xmx1600m \
                 -XDignore.symbol.file \