diff options
| author | Raphael Moll <ralf@android.com> | 2013-01-04 11:22:55 -0800 |
|---|---|---|
| committer | Raphael Moll <ralf@android.com> | 2013-01-04 11:38:43 -0800 |
| commit | 98df0cd625983742fc6dec224b0e2ce8fe6e74f6 (patch) | |
| tree | 4b463e4acea24d14f9f66200cd7f76700ce33987 /build | |
| parent | 7dc0566c1785af9e06f9eca0a6da17e15848cea2 (diff) | |
| download | sdk-98df0cd625983742fc6dec224b0e2ce8fe6e74f6.zip sdk-98df0cd625983742fc6dec224b0e2ce8fe6e74f6.tar.gz sdk-98df0cd625983742fc6dec224b0e2ce8fe6e74f6.tar.bz2 | |
SDK: Use prebuilds/devtools for manifmerger and jobb JAR libraries.
Change-Id: Ic57371dcea36a94a1173012e7c252cd8cf317c88
Diffstat (limited to 'build')
| -rw-r--r-- | build/tools.atree | 20 | ||||
| -rwxr-xr-x | build/tools.windows.atree | 2 |
2 files changed, 10 insertions, 12 deletions
diff --git a/build/tools.atree b/build/tools.atree index 5ace26d..c539743 100644 --- a/build/tools.atree +++ b/build/tools.atree @@ -63,15 +63,15 @@ lib/lib64GLES_V2_translator${DLL_EXTENSION} strip tools/lib/lib64GLES_V2_transla lib/lib64EGL_translator${DLL_EXTENSION} strip tools/lib/lib64EGL_translator${DLL_EXTENSION} # Java-Based SDK Tools -bin/ddms tools/ddms -bin/hierarchyviewer tools/hierarchyviewer -bin/draw9patch tools/draw9patch -bin/traceview tools/traceview -bin/android tools/android -bin/monkeyrunner tools/monkeyrunner -bin/lint tools/lint -bin/uiautomatorviewer tools/uiautomatorviewer -bin/jobb tools/jobb +bin/ddms tools/ddms +bin/hierarchyviewer tools/hierarchyviewer +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 # sdk.git Ant templates for project build files sdk/templates/build.template tools/lib/build.template @@ -197,6 +197,4 @@ framework/sdklib-tests.jar tests/libtests/sdklib-tests.jar framework/sdkuilib-tests.jar tests/libtests/sdkuilib-tests.jar framework/layoutlib_api.jar tests/libtests/layoutlib_api.jar framework/dvlib-tests.jar tests/libtests/dvlib-tests.jar -#FIXME breaks build, manifmerger jar files not properly built -#framework/manifmerger-tests.jar tests/libtests/manifmerger-tests.jar diff --git a/build/tools.windows.atree b/build/tools.windows.atree index 00e6474..f936d96 100755 --- a/build/tools.windows.atree +++ b/build/tools.windows.atree @@ -40,7 +40,7 @@ rm tools/lint sdk/lint/cli/etc/lint.bat tools/lint.bat rm tools/jobb -sdk/jobb/etc/jobb.bat tools/jobb.bat +prebuilts/devtools/jobb/etc/jobb.bat tools/jobb.bat rm tools/emulator |