Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 75814c19 authored by Deepanshu Gupta's avatar Deepanshu Gupta Committed by Android Git Automerger
Browse files

am e23620e6: Merge "Build LayoutLib with Java 6" into lmp-preview-dev 

* commit 'e23620e684ae73558e42a51f93004c8de07ba8d5':
  Build LayoutLib with Java 6
parents e294f40b acb119f0

tools/layoutlib/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -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

tools/layoutlib/bridge/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -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 := \