StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

This reverts commit cdfbe4a852.

Change-Id: Ibb655daa05de55c3c947141ddf96a32ca1d87de4
This commit is contained in:
Neil Fuller
2016-01-29 13:29:39 +00:00
parent cdfbe4a852
commit 8db0d9724f
3 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java_common.mk
View File

@@ -1,13 +1,5 @@
# 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
###########################################################
@@ -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, \