From f4058c8d6b7d3d36b3ba93eb5996848f8a8412c9 Mon Sep 17 00:00:00 2001 From: Deepanshu Gupta Date: Sat, 7 Jun 2014 11:19:03 -0700 Subject: Build LayoutLib with Java 6 Add source and target flags to LayoutLib Bridge to enable compatibility with Java 6. Change-Id: I81266af758bb57df037541d6e82600e5020a3c0d --- tools/layoutlib/Android.mk | 2 ++ tools/layoutlib/bridge/Android.mk | 1 + 2 files changed, 3 insertions(+) (limited to 'tools') 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 := \ -- cgit v1.1