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

Commit 2428bfeb authored by Neil Fuller's avatar Neil Fuller
Browse files

Allow java targets to support 1.8 source / target 

This change enables build rules to specify:

LOCAL_JAVA_LANGUAGE_VERSION := 1.8

to enable -source 1.8 -target 1.8 for javac and
equivalent flags for Jack.

Bug: 26753820
(cherry-picked from commit cdfbe4a8)

Change-Id: I361c99dd599e7b4a041f02c9562e461da2b0502e
parent 655dd3ea

core/clear_vars.mk

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

###########################################################
@@ -265,6 +273,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, \