Skip to content

Commit 0db3844

Browse files
author
Xavier Ducrohet
committed
Make layoutlib use the prebuilt of layoutlib_api
Change-Id: Ie04a9e847acacf7b2aeb179589517fc75688c75b
1 parent db723ea commit 0db3844

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

tools/layoutlib/bridge/.classpath

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<classpathentry kind="src" path="tests"/>
55
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
66
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
7-
<classpathentry combineaccessrules="false" kind="src" path="/layoutlib_api"/>
7+
<classpathentry kind="var" path="ANDROID_SRC/prebuilt/common/layoutlib_api/layoutlib_api-prebuilt.jar"/>
88
<classpathentry kind="var" path="ANDROID_SRC/prebuilt/common/kxml2/kxml2-2.3.0.jar" sourcepath="/ANDROID_SRC/dalvik/libcore/xml/src/main/java"/>
99
<classpathentry kind="var" path="ANDROID_OUT_FRAMEWORK/layoutlib.jar" sourcepath="/ANDROID_SRC/frameworks/base/core/java"/>
1010
<classpathentry kind="var" path="ANDROID_OUT_FRAMEWORK/ninepatch.jar" sourcepath="/ANDROID_SRC/development/tools/ninepatch/src"/>

tools/layoutlib/bridge/Android.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under,src)
2020

2121
LOCAL_JAVA_LIBRARIES := \
2222
kxml2-2.3.0 \
23-
layoutlib_api \
23+
layoutlib_api-prebuilt \
2424
ninepatch
2525

2626
LOCAL_STATIC_JAVA_LIBRARIES := temp_layoutlib

0 commit comments

Comments
 (0)