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

Commit 48cad7fa authored Feb 18, 2016 by Deepanshu Gupta Committed by Android (Google) Code Review Feb 18, 2016

Merge "Switch LayoutLib to Java 8" into nyc-dev

parents 7651b21f 7914e4ca

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)