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 /build | |
parent | 4ae82e1d50430c049c4c4fb520cb32c55c651654 (diff) | |
download | sdk-b15ea7875a9a4101d4be7e547950b7d2b64c1464.zip sdk-b15ea7875a9a4101d4be7e547950b7d2b64c1464.tar.gz sdk-b15ea7875a9a4101d4be7e547950b7d2b64c1464.tar.bz2 |
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 'build')
-rw-r--r-- | build/product_sdk.mk | 2 | ||||
-rw-r--r-- | build/tools.atree | 9 | ||||
-rwxr-xr-x | build/tools.windows.atree | 4 |
3 files changed, 5 insertions, 10 deletions
diff --git a/build/product_sdk.mk b/build/product_sdk.mk index 226dba3..cf4879e 100644 --- a/build/product_sdk.mk +++ b/build/product_sdk.mk @@ -33,13 +33,11 @@ PRODUCT_PACKAGES += \ anttasks \ archquery \ assetstudio \ - common-tests \ ddmlib \ ddms \ ddmuilib \ draw9patch \ dvlib \ - dvlib-tests \ hierarchyviewer \ sdk_common \ layoutlib_api \ diff --git a/build/tools.atree b/build/tools.atree index a8c9da6..f049e96 100644 --- a/build/tools.atree +++ b/build/tools.atree @@ -69,9 +69,9 @@ bin/draw9patch tools/draw9patch bin/traceview tools/traceview bin/android tools/android bin/monkeyrunner tools/monkeyrunner -bin/lint tools/lint bin/uiautomatorviewer tools/uiautomatorviewer -prebuilts/devtools/jobb/etc/jobb tools/jobb +prebuilts/devtools/etc/jobb tools/jobb +prebuilts/devtools/etc/lint tools/lint # sdk.git Ant templates for project build files sdk/templates/build.template tools/lib/build.template @@ -135,7 +135,7 @@ prebuilts/tools/common/http-client/commons-logging-1.1.1.jar prebuilts/tools/common/http-client/commons-codec-1.4.jar tools/lib/commons-codec-1.4.jar framework/emmalib.jar tools/lib/emma_device.jar external/emma/lib/emma.jar tools/lib/emma.jar -external/emma/lib/emma_ant.jar tools/lib/emma_ant.jar +external/emma/lib/emma_ant.jar tools/lib/emma_ant.jar prebuilts/tools/common/jfreechart/jcommon-1.0.12.jar tools/lib/jcommon-1.0.12.jar prebuilts/tools/common/jfreechart/jfreechart-1.0.9.jar tools/lib/jfreechart-1.0.9.jar prebuilts/tools/common/jfreechart/jfreechart-1.0.9-swt.jar tools/lib/jfreechart-1.0.9-swt.jar @@ -191,7 +191,4 @@ sdk/files/typos tools/support sdk/testapps tests/testapps framework/ninepatch-tests.jar tests/libtests/ninepatch-tests.jar -framework/common-tests.jar tests/libtests/common-tests.jar -framework/layoutlib_api.jar tests/libtests/layoutlib_api.jar -framework/dvlib-tests.jar tests/libtests/dvlib-tests.jar diff --git a/build/tools.windows.atree b/build/tools.windows.atree index f936d96..3a84ff8 100755 --- a/build/tools.windows.atree +++ b/build/tools.windows.atree @@ -37,10 +37,10 @@ rm tools/draw9patch sdk/draw9patch/etc/draw9patch.bat tools/draw9patch.bat rm tools/lint -sdk/lint/cli/etc/lint.bat tools/lint.bat +prebuilts/devtools/etc/lint.bat tools/lint.bat rm tools/jobb -prebuilts/devtools/jobb/etc/jobb.bat tools/jobb.bat +prebuilts/devtools/etc/jobb.bat tools/jobb.bat rm tools/emulator |