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 7914e4ca03)
Change-Id: Ice5741dcb8b93faf739a3c21f2ed8be95f92ad08
This commit is contained in:
committed by
Neil Fuller
parent
c6e35f2e65
commit
fda1ace261
@@ -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
|
||||
|
||||
@@ -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 \
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user