diff options
| author | 2016-02-18 04:53:02 +0000 | |
|---|---|---|
| committer | 2016-02-18 04:53:03 +0000 | |
| commit | 48cad7fa07ee5dd92f3f10ac80040a2639eb0ec0 (patch) | |
| tree | 18c8cb16862c562a2b00a1d38a97f1b129b8e962 | |
| parent | 7651b21fe94dc081276a7bbff72f8c37a70f1b94 (diff) | |
| parent | 7914e4ca03322427740d6f8c00837375dbf3031a (diff) | |
Merge "Switch LayoutLib to Java 8" into nyc-dev
| -rw-r--r-- | tools/layoutlib/Android.mk | 2 | ||||
| -rw-r--r-- | tools/layoutlib/bridge/Android.mk | 1 | ||||
| -rw-r--r-- | tools/layoutlib/bridge/tests/Android.mk | 2 | ||||
| -rw-r--r-- | tools/layoutlib/create/Android.mk | 2 | ||||
| -rw-r--r-- | tools/layoutlib/create/tests/Android.mk | 2 |
5 files changed, 9 insertions, 0 deletions
diff --git a/tools/layoutlib/Android.mk b/tools/layoutlib/Android.mk index 5e57a2533657..c2ad9ef65faf 100644 --- a/tools/layoutlib/Android.mk +++ b/tools/layoutlib/Android.mk @@ -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 diff --git a/tools/layoutlib/bridge/Android.mk b/tools/layoutlib/bridge/Android.mk index 3dd8002bcff5..16e5913ab81d 100644 --- a/tools/layoutlib/bridge/Android.mk +++ b/tools/layoutlib/bridge/Android.mk @@ -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 \ diff --git a/tools/layoutlib/bridge/tests/Android.mk b/tools/layoutlib/bridge/tests/Android.mk index 8a81d0b684db..5c062d0c7042 100644 --- a/tools/layoutlib/bridge/tests/Android.mk +++ b/tools/layoutlib/bridge/tests/Android.mk @@ -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 diff --git a/tools/layoutlib/create/Android.mk b/tools/layoutlib/create/Android.mk index c7f2c4137687..47377ae42d01 100644 --- a/tools/layoutlib/create/Android.mk +++ b/tools/layoutlib/create/Android.mk @@ -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 diff --git a/tools/layoutlib/create/tests/Android.mk b/tools/layoutlib/create/tests/Android.mk index dafb9c6f9402..c59528e81ef2 100644 --- a/tools/layoutlib/create/tests/Android.mk +++ b/tools/layoutlib/create/tests/Android.mk @@ -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) |