diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-02-09 16:27:27 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-02-09 16:27:27 -0800 |
| commit | e18457fbef2ef8b74fb6d7a023b5a6fe4a707bed (patch) | |
| tree | 0f1a4a1a85c29b8b52d0f02f5051c2851b6bce47 /tools/layoutlib/bridge | |
| parent | a81c2193f7f99566f6183bd7598e919381f5b1f0 (diff) | |
| parent | f3f608452c080f050e2b5088d421ffe22641531f (diff) | |
| download | frameworks_base-e18457fbef2ef8b74fb6d7a023b5a6fe4a707bed.zip frameworks_base-e18457fbef2ef8b74fb6d7a023b5a6fe4a707bed.tar.gz frameworks_base-e18457fbef2ef8b74fb6d7a023b5a6fe4a707bed.tar.bz2 | |
Merge "LayoutLib: now depends on tools-common-prebuilt."
Diffstat (limited to 'tools/layoutlib/bridge')
| -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 2eaf8e3..5cfda29 100644 --- a/tools/layoutlib/bridge/.classpath +++ b/tools/layoutlib/bridge/.classpath @@ -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> diff --git a/tools/layoutlib/bridge/Android.mk b/tools/layoutlib/bridge/Android.mk index ca7db8c..7e70f33 100644 --- a/tools/layoutlib/bridge/Android.mk +++ b/tools/layoutlib/bridge/Android.mk @@ -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 \ |