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

Commit fda1ace2 authored by Deepanshu Gupta's avatar Deepanshu Gupta Committed by Neil Fuller
Browse files

Switch LayoutLib to Java 8 

The main build hasn't swtiched to java 8, but lambdas are already used
in layoutlib. This fixes the build break.

(cherry picked from commit 7914e4ca)

Change-Id: Ice5741dcb8b93faf739a3c21f2ed8be95f92ad08
parent c6e35f2e

tools/layoutlib/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 
LOCAL_PATH := $(my-dir)

include $(CLEAR_VARS)



LOCAL_JAVA_LANGUAGE_VERSION := 1.8



#

# Define rules to build temp_layoutlib.jar, which contains a subset of

# the classes in framework.jar.  The layoutlib_create tool is used to

tools/layoutlib/bridge/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ include $(CLEAR_VARS) 


LOCAL_SRC_FILES := $(call all-java-files-under,src)

LOCAL_JAVA_RESOURCE_DIRS := resources

LOCAL_JAVA_LANGUAGE_VERSION := 1.8



LOCAL_JAVA_LIBRARIES := \

	layoutlib_api-prebuilt \

tools/layoutlib/bridge/tests/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ LOCAL_PATH := $(call my-dir) 


include $(CLEAR_VARS)



LOCAL_JAVA_LANGUAGE_VERSION := 1.8



# Only compile source java files in this lib.

LOCAL_SRC_FILES := $(call all-java-files-under, src)

LOCAL_JAVA_RESOURCE_DIRS := res

tools/layoutlib/create/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 
LOCAL_PATH := $(call my-dir)

include $(CLEAR_VARS)



LOCAL_JAVA_LANGUAGE_VERSION := 1.8



LOCAL_SRC_FILES := $(call all-java-files-under,src)



LOCAL_JAR_MANIFEST := manifest.txt

tools/layoutlib/create/tests/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ 
LOCAL_PATH := $(call my-dir)

include $(CLEAR_VARS)



LOCAL_JAVA_LANGUAGE_VERSION := 1.8



# Only compile source java files in this lib.

LOCAL_SRC_FILES := $(call all-java-files-under, com)