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

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

Merge "Merge 1911a6f7 into gingerbread. do not merge." into gingerbread

parents 919853ce efe18b5e

tools/layoutlib/.gitignore

+1 −2
Original line number Diff line number Diff line 
bridge/bin

create/bin
 
bin
 
 No newline at end of file

tools/layoutlib/bridge/.classpath

+0 −2
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<classpath>

	<classpathentry excluding="org/kxml2/io/" kind="src" path="src"/>

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

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

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

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

	<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"/>

tools/layoutlib/bridge/Android.mk

+3 −0
Original line number Diff line number Diff line
@@ -33,3 +33,6 @@ LOCAL_MODULE := layoutlib 


include $(BUILD_HOST_JAVA_LIBRARY)



# Build all sub-directories

include $(call all-makefiles-under,$(LOCAL_PATH))

tools/layoutlib/bridge/tests/.classpath

0 → 100644
+10 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<classpath>

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

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

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

	<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="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>

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

</classpath>

tools/layoutlib/bridge/tests/.project

0 → 100644
+17 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<projectDescription>

	<name>layoutlib_bridge-tests</name>

	<comment></comment>

	<projects>

	</projects>

	<buildSpec>

		<buildCommand>

			<name>org.eclipse.jdt.core.javabuilder</name>

			<arguments>

			</arguments>

		</buildCommand>

	</buildSpec>

	<natures>

		<nature>org.eclipse.jdt.core.javanature</nature>

	</natures>

</projectDescription>