From: Neil Fuller <nfuller@google.com>
Date: Fri, 29 Jan 2016 13:29:39 +0000 (+0000)
Subject: Revert "Allow java targets to support 1.8 source / target"
X-Git-Tag: android-x86-7.1-r1~504^2~1
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8db0d9724faf8e4ff0d2ced10b7ff479ed13fa77;p=android-x86%2Fbuild.git

Revert "Allow java targets to support 1.8 source / target"

Broke the sdk build. Requires changes in development that aren't available for submission yet.

This reverts commit cdfbe4a8522b9a13ffe6ac1f826a1d6760f87d60.

Change-Id: Ibb655daa05de55c3c947141ddf96a32ca1d87de4
---

diff --git a/core/clear_vars.mk b/core/clear_vars.mk
index 069fbf97b..656f32736 100644
--- a/core/clear_vars.mk
+++ b/core/clear_vars.mk
@@ -342,7 +342,6 @@ LOCAL_CLANG_32:=
 LOCAL_CLANG_64:=
 LOCAL_INIT_RC_32:=
 LOCAL_INIT_RC_64:=
-LOCAL_JAVA_LANGUAGE_VERSION:=
 
 # Trim MAKEFILE_LIST so that $(call my-dir) doesn't need to
 # iterate over thousands of entries every time.
diff --git a/core/combo/javac.mk b/core/combo/javac.mk
index 7f66ea83a..70dae1302 100644
--- a/core/combo/javac.mk
+++ b/core/combo/javac.mk
@@ -14,7 +14,7 @@ ifndef ANDROID_COMPILE_WITH_JACK
 ANDROID_COMPILE_WITH_JACK := true
 endif
 
-common_jdk_flags := -Xmaxerrs 9999999
+common_jdk_flags := -source 1.7 -target 1.7 -Xmaxerrs 9999999
 
 # Use the indexer wrapper to index the codebase instead of the javac compiler
 ifeq ($(ALTERNATE_JAVAC),)
diff --git a/core/java_common.mk b/core/java_common.mk
index 08e5ee799..5e0dfa005 100644
--- a/core/java_common.mk
+++ b/core/java_common.mk
@@ -1,14 +1,6 @@
 # Common to host and target Java modules.
 
 ###########################################################
-## Java version
-###########################################################
-ifeq (,$(LOCAL_JAVA_LANGUAGE_VERSION))
-  LOCAL_JAVA_LANGUAGE_VERSION := 1.7
-endif
-LOCAL_JAVACFLAGS += -source $(LOCAL_JAVA_LANGUAGE_VERSION) -target $(LOCAL_JAVA_LANGUAGE_VERSION)
-
-###########################################################
 ## .proto files: Compile proto files to .java
 ###########################################################
 proto_sources := $(filter %.proto,$(LOCAL_SRC_FILES))
@@ -275,8 +267,6 @@ ALL_MODULES.$(my_register_name).INTERMEDIATE_SOURCE_DIR := \
 ifdef LOCAL_JACK_ENABLED
 ifdef need_compile_java
 
-LOCAL_JACK_FLAGS += -D jack.java.source.version=$(LOCAL_JAVA_LANGUAGE_VERSION)
-
 full_static_jack_libs := \
     $(foreach lib,$(LOCAL_STATIC_JAVA_LIBRARIES), \
       $(call intermediates-dir-for, \