diff options
| author | 2014-06-07 23:32:10 +0000 | |
|---|---|---|
| committer | 2014-06-07 23:32:10 +0000 | |
| commit | acb119f0a257e4e542a4450f60405b21a53f3545 (patch) | |
| tree | 3c183f75992147a939eff0b0a86d3496fb88261e | |
| parent | 000cdd5fe55a6a4166de7d915708d43f87ccf2fb (diff) | |
| parent | f4058c8d6b7d3d36b3ba93eb5996848f8a8412c9 (diff) | |
Merge "Build LayoutLib with Java 6" into lmp-preview-dev
| -rw-r--r-- | tools/layoutlib/Android.mk | 2 | ||||
| -rw-r--r-- | tools/layoutlib/bridge/Android.mk | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/tools/layoutlib/Android.mk b/tools/layoutlib/Android.mk index cb68340b3f5e..08486e643431 100644 --- a/tools/layoutlib/Android.mk +++ b/tools/layoutlib/Android.mk @@ -16,6 +16,8 @@ LOCAL_PATH := $(my-dir) include $(CLEAR_VARS) +LOCAL_JAVACFLAGS := -source 6 -target 6 + # # 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 e3d48fca5eb2..cfd597e4011d 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_JAVACFLAGS := -source 6 -target 6 LOCAL_JAVA_LIBRARIES := \ |