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

Commit e18457fb authored by Xavier Ducrohet's avatar Xavier Ducrohet Committed by Android (Google) Code Review
Browse files

Merge "LayoutLib: now depends on tools-common-prebuilt."

parents a81c2193 f3f60845

tools/layoutlib/bridge/.classpath

+1 −1
Original line number Diff line number Diff line
@@ -8,6 +8,6 @@ 
	<classpathentry kind="var" path="ANDROID_PLAT_SRC/prebuilt/common/kxml2/kxml2-2.3.0.jar" sourcepath="/ANDROID_PLAT_SRC/dalvik/libcore/xml/src/main/java"/>

	<classpathentry kind="var" path="ANDROID_PLAT_SRC/out/host/common/obj/JAVA_LIBRARIES/temp_layoutlib_intermediates/javalib.jar" sourcepath="/ANDROID_PLAT_SRC/frameworks/base"/>

	<classpathentry kind="var" path="ANDROID_PLAT_SRC/prebuilt/common/ninepatch/ninepatch-prebuilt.jar"/>

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

	<classpathentry kind="var" path="ANDROID_PLAT_SRC/prebuilt/common/tools-common/tools-common-prebuilt.jar"/>

	<classpathentry kind="output" path="bin"/>

</classpath>

tools/layoutlib/bridge/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ LOCAL_JAVA_RESOURCE_DIRS := resources 
LOCAL_JAVA_LIBRARIES := \

	kxml2-2.3.0 \

	layoutlib_api-prebuilt \

	common-prebuilt

	tools-common-prebuilt



LOCAL_STATIC_JAVA_LIBRARIES := \

	temp_layoutlib \