diff options
| author | Xavier Ducrohet <xav@android.com> | 2012-08-07 16:30:38 -0700 |
|---|---|---|
| committer | Xavier Ducrohet <xav@android.com> | 2012-08-07 18:47:31 -0700 |
| commit | 85e4a1a9dd133abb879ec211ce8dd385004edf22 (patch) | |
| tree | 5e329ad383321880ec28627a3f6f4b9a5d646a61 /assetstudio | |
| parent | f9344c0eeacad791fe10a5d1ffc05de2187bf0c6 (diff) | |
| download | sdk-85e4a1a9dd133abb879ec211ce8dd385004edf22.zip sdk-85e4a1a9dd133abb879ec211ce8dd385004edf22.tar.gz sdk-85e4a1a9dd133abb879ec211ce8dd385004edf22.tar.bz2 | |
Refactor common.jar
Move resources and com.android.util.Pair into layoutlib_api
where they belong since layoutlib depends on them and we need
to control the API.
Made a copy of Pair to stay in common.jar but moved it to
com.android.utils.Pair (the one in com.android.util.Pair is
marked as deprecated to prevent usage where applicable).
Also moved XmlUtil and PositionXmlParser to com.android.utils
to match Pair.
Change-Id: I21d7057d3f2ce604f86a3bb1fa3c130948c93b89
Diffstat (limited to 'assetstudio')
| -rw-r--r-- | assetstudio/.classpath | 4 | ||||
| -rw-r--r-- | assetstudio/Android.mk | 6 | ||||
| -rw-r--r-- | assetstudio/etc/manifest.txt | 1 |
3 files changed, 7 insertions, 4 deletions
diff --git a/assetstudio/.classpath b/assetstudio/.classpath index 986bffa..e8cb8e6 100644 --- a/assetstudio/.classpath +++ b/assetstudio/.classpath @@ -3,8 +3,8 @@ <classpathentry kind="src" path="src"/> <classpathentry kind="src" path="tests/src"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry combineaccessrules="false" kind="src" path="/common"/> <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/> - <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/guava-tools/guava-10.0.1.jar" sourcepath="ANDROID_SRC/prebuilts/tools/common/guava-tools/src.zip"/> + <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/guava-tools/guava-10.0.1.jar" sourcepath="ANDROID_SRC/prebuilts/tools/common/guava-tools/src.zip"/> + <classpathentry combineaccessrules="false" kind="src" path="/layoutlib_api"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/assetstudio/Android.mk b/assetstudio/Android.mk index e55ac55..35943f2 100644 --- a/assetstudio/Android.mk +++ b/assetstudio/Android.mk @@ -21,8 +21,10 @@ LOCAL_JAVA_RESOURCE_DIRS := src # TODO: Replace common with the batik stuff LOCAL_JAVA_LIBRARIES := \ - common \ - guava-tools + guava-tools \ + layoutlib_api + +LOCAL_JAR_MANIFEST := etc/manifest.txt LOCAL_MODULE := assetstudio diff --git a/assetstudio/etc/manifest.txt b/assetstudio/etc/manifest.txt new file mode 100644 index 0000000..23e6524 --- /dev/null +++ b/assetstudio/etc/manifest.txt @@ -0,0 +1 @@ +Class-Path: layoutlib_api.jar |