diff options
| author | Xavier Ducrohet <xav@android.com> | 2010-10-22 13:28:39 -0700 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2010-10-22 13:28:39 -0700 |
| commit | c5371fadf2753d074ef117685fed05b0140d6864 (patch) | |
| tree | 64f7ac323f0fef2863f48c7b09ebae593566f978 | |
| parent | 15358e145622df90942a444a63ae0006713b636d (diff) | |
| parent | 0db38449257d6702d18ddf77b019bef38ce3d692 (diff) | |
| download | frameworks_base-c5371fadf2753d074ef117685fed05b0140d6864.zip frameworks_base-c5371fadf2753d074ef117685fed05b0140d6864.tar.gz frameworks_base-c5371fadf2753d074ef117685fed05b0140d6864.tar.bz2 | |
Merge "Make layoutlib use the prebuilt of layoutlib_api"
| -rw-r--r-- | tools/layoutlib/bridge/.classpath | 2 | ||||
| -rw-r--r-- | tools/layoutlib/bridge/Android.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/layoutlib/bridge/.classpath b/tools/layoutlib/bridge/.classpath index 175a98b..70140d8 100644 --- a/tools/layoutlib/bridge/.classpath +++ b/tools/layoutlib/bridge/.classpath @@ -4,7 +4,7 @@ <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 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_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"/> diff --git a/tools/layoutlib/bridge/Android.mk b/tools/layoutlib/bridge/Android.mk index b2010d5..b7a602a 100644 --- a/tools/layoutlib/bridge/Android.mk +++ b/tools/layoutlib/bridge/Android.mk @@ -20,7 +20,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under,src) LOCAL_JAVA_LIBRARIES := \ kxml2-2.3.0 \ - layoutlib_api \ + layoutlib_api-prebuilt \ ninepatch LOCAL_STATIC_JAVA_LIBRARIES := temp_layoutlib |