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

Commit 2051a1be authored by Xavier Ducrohet's avatar Xavier Ducrohet Committed by Android Git Automerger
Browse files

am c5371fad: Merge "Make layoutlib use the prebuilt of layoutlib_api"

parents faf53c0b c5371fad

tools/layoutlib/bridge/.classpath

+1 −1
Original line number Original line Diff line number Diff line
@@ -4,7 +4,7 @@ 
	<classpathentry kind="src" path="tests"/>

	<classpathentry kind="src" path="tests"/>

	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>

	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>

	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>

	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>

	<classpathentry combineaccessrules="false" kind="src" path="/layoutlib_api"/>

	<classpathentry kind="var" path="ANDROID_SRC/prebuilt/common/layoutlib_api/layoutlib_api-prebuilt.jar"/>

	<classpathentry kind="var" path="ANDROID_SRC/prebuilt/common/kxml2/kxml2-2.3.0.jar" sourcepath="/ANDROID_SRC/dalvik/libcore/xml/src/main/java"/>

	<classpathentry kind="var" path="ANDROID_SRC/prebuilt/common/kxml2/kxml2-2.3.0.jar" sourcepath="/ANDROID_SRC/dalvik/libcore/xml/src/main/java"/>

	<classpathentry kind="var" path="ANDROID_OUT_FRAMEWORK/layoutlib.jar" sourcepath="/ANDROID_SRC/frameworks/base/core/java"/>

	<classpathentry kind="var" path="ANDROID_OUT_FRAMEWORK/layoutlib.jar" sourcepath="/ANDROID_SRC/frameworks/base/core/java"/>

	<classpathentry kind="var" path="ANDROID_OUT_FRAMEWORK/ninepatch.jar" sourcepath="/ANDROID_SRC/development/tools/ninepatch/src"/>

	<classpathentry kind="var" path="ANDROID_OUT_FRAMEWORK/ninepatch.jar" sourcepath="/ANDROID_SRC/development/tools/ninepatch/src"/>

tools/layoutlib/bridge/Android.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -20,7 +20,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under,src) 




LOCAL_JAVA_LIBRARIES := \

LOCAL_JAVA_LIBRARIES := \

	kxml2-2.3.0 \

	kxml2-2.3.0 \

	layoutlib_api \

	layoutlib_api-prebuilt \

	ninepatch

	ninepatch





LOCAL_STATIC_JAVA_LIBRARIES := temp_layoutlib

LOCAL_STATIC_JAVA_LIBRARIES := temp_layoutlib