commit 56c80bee6cdc8df62c969b975a073d4e6c3663ee
author Tobias Thierer <tobiast@google.com> Wed May 24 10:36:34 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed May 24 10:36:34 2017 +0000
tree 2b9f1cdfda45e523dd796a082063f7238814b49a
parent 8c9d36370b43a841fbe6e35fec945fa44ad745aa
parent 5a64925af7480d40ac841e5f33e0cf10d747771e

Merge "Drop build support for LEGACY_USE_JAVA7." am: 5368131063 am: 28be9906d4 am: 7d8194becd
am: 5a64925af7

Change-Id: I815239dee046c40df5618770c8777c8f632cd7a0

core/droiddoc.mk

diff --git a/core/droiddoc.mk b/core/droiddoc.mk
index f2714ee..27e44a0 100644
--- a/core/droiddoc.mk
+++ b/core/droiddoc.mk
@@ -217,7 +217,7 @@
                 \@$(PRIVATE_SRC_LIST_FILE) \
                 -J-Xmx1024m \
                 -XDignore.symbol.file \
-                $(if $(LEGACY_USE_JAVA7),,-Xdoclint:none) \
+                -Xdoclint:none \
                 $(PRIVATE_PROFILING_OPTIONS) \
                 $(addprefix -classpath ,$(PRIVATE_CLASSPATH)) \
                 $(addprefix -bootclasspath ,$(PRIVATE_BOOTCLASSPATH)) \

core/java_common.mk

diff --git a/core/java_common.mk b/core/java_common.mk
index 555712c..0859a46 100644
--- a/core/java_common.mk
+++ b/core/java_common.mk
@@ -19,12 +19,7 @@
   ifneq (,$(filter $(LOCAL_SDK_VERSION), $(private_sdk_versions_without_any_java_18_support)))
     LOCAL_JAVA_LANGUAGE_VERSION := 1.7
   else
-    # This retains 1.7 for ART build bots only. http://b/27583810
-    ifeq (,$(LEGACY_USE_JAVA7))
-      LOCAL_JAVA_LANGUAGE_VERSION := 1.8
-    else
-      LOCAL_JAVA_LANGUAGE_VERSION := 1.7
-    endif
+    LOCAL_JAVA_LANGUAGE_VERSION := 1.8
   endif
 endif
 LOCAL_JAVACFLAGS += -source $(LOCAL_JAVA_LANGUAGE_VERSION) -target $(LOCAL_JAVA_LANGUAGE_VERSION)