diff options
| author | Raphael Moll <ralf@android.com> | 2013-02-05 10:55:22 -0800 |
|---|---|---|
| committer | Raphael Moll <ralf@android.com> | 2013-02-06 19:55:53 -0800 |
| commit | b15ea7875a9a4101d4be7e547950b7d2b64c1464 (patch) | |
| tree | 6523e17c6056b4bbff28648323ec2150518b6cf4 /assetstudio | |
| parent | 4ae82e1d50430c049c4c4fb520cb32c55c651654 (diff) | |
| download | sdk-b15ea7875a9a4101d4be7e547950b7d2b64c1464.tar.gz sdk-b15ea7875a9a4101d4be7e547950b7d2b64c1464.tar.bz2 sdk-b15ea7875a9a4101d4be7e547950b7d2b64c1464.zip | |
Change more SDK libs to prebuilts.
Requires prebuilds/devtools.git I913a29e5f40db99871701461aad6fc38483015d2
To update the prebuilts, you need tools/base.git and the
prebuilts/devtools/update_jars.sh script.
This is supposed to be an intermediary step as we switch to tools/base.
Change-Id: I3dcccfdd9dc243a22a5bfd9db6779d24285db1ac
Diffstat (limited to 'assetstudio')
| -rw-r--r-- | assetstudio/Android.mk | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/assetstudio/Android.mk b/assetstudio/Android.mk index 88f498774..17f9415fe 100644 --- a/assetstudio/Android.mk +++ b/assetstudio/Android.mk @@ -16,8 +16,14 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(call all-java-files-under,src) -LOCAL_JAVA_RESOURCE_DIRS := src +# The assetstudio code has moved to tools/base/assetstudio. +# The rule below uses the prebuilt assetstudio.jar. +# +# If you want to run the tests, cd to tools/base/assetstudio +# and run ./gradlew :assetstudio:test + +LOCAL_MODULE := assetstudio +LOCAL_MODULE_TAGS := optional # TODO: Replace common with the batik stuff LOCAL_JAVA_LIBRARIES := \ @@ -27,8 +33,8 @@ LOCAL_JAVA_LIBRARIES := \ LOCAL_JAR_MANIFEST := etc/manifest.txt -LOCAL_MODULE := assetstudio +LOCAL_PREBUILT_JAVA_LIBRARIES := \ + ../../prebuilts/devtools/$(LOCAL_MODULE)$(COMMON_JAVA_PACKAGE_SUFFIX) -LOCAL_MODULE_TAGS := optional +include $(BUILD_HOST_PREBUILT) -include $(BUILD_HOST_JAVA_LIBRARY) |