diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-06-09 15:55:24 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-09 15:55:24 +0000 |
| commit | 75814c19d33d8f206e7b1113d15fe4ae9f2a7c26 (patch) | |
| tree | d243b0f7b30e82ad3b188932e222b4e899b2e776 /tools | |
| parent | e294f40b1dfc228604156143bab1328ff614588c (diff) | |
| parent | acb119f0a257e4e542a4450f60405b21a53f3545 (diff) | |
| download | frameworks_base-75814c19d33d8f206e7b1113d15fe4ae9f2a7c26.zip frameworks_base-75814c19d33d8f206e7b1113d15fe4ae9f2a7c26.tar.gz frameworks_base-75814c19d33d8f206e7b1113d15fe4ae9f2a7c26.tar.bz2 | |
am e23620e6: Merge "Build LayoutLib with Java 6" into lmp-preview-dev
* commit 'e23620e684ae73558e42a51f93004c8de07ba8d5':
Build LayoutLib with Java 6
Diffstat (limited to 'tools')
| -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 cb68340..08486e6 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 e3d48fc..cfd597e 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 := \ |