Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Deepanshu Gupta
2016-04-29 20:05:37 +00:00
committed by Android (Google) Code Review
parent 60f2c17e27 621c43d8e5
commit 2385e2184a
5 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/layoutlib/Android.mk
View File

@@ -16,8 +16,6 @@
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

1
tools/layoutlib/bridge/Android.mk
View File

@@ -18,7 +18,6 @@ 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 \

2
tools/layoutlib/bridge/tests/Android.mk
View File

@@ -16,8 +16,6 @@ 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

2
tools/layoutlib/create/Android.mk
View File

@@ -16,8 +16,6 @@
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

2
tools/layoutlib/create/tests/Android.mk
View File

@@ -15,8 +15,6 @@
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)