Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e17ccfdb authored by Neil Fuller's avatar Neil Fuller Committed by Android (Google) Code Review
Browse files

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

parents bee8fb86 ad02251a

core/clear_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -342,6 +342,7 @@ 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.

core/combo/javac.mk

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ ifndef ANDROID_COMPILE_WITH_JACK 
ANDROID_COMPILE_WITH_JACK := true

endif



common_jdk_flags := -source 1.7 -target 1.7 -Xmaxerrs 9999999

common_jdk_flags := -Xmaxerrs 9999999



# Use the indexer wrapper to index the codebase instead of the javac compiler

ifeq ($(ALTERNATE_JAVAC),)

core/java_common.mk

+10 −0
Original line number Diff line number Diff line 
# 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

###########################################################
@@ -267,6 +275,8 @@ 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, \