diff options
| author | Raphael Moll <ralf@android.com> | 2013-01-07 12:14:50 -0800 |
|---|---|---|
| committer | Raphael Moll <ralf@android.com> | 2013-01-08 13:58:53 -0800 |
| commit | b6049e3c93e27b943832ec300a6d9b04f4f6d474 (patch) | |
| tree | a38eb8075a11ebca64d6e8e0f83a73ae7669a731 /build | |
| parent | 4d69200e272697b788963c7f516d868c95d22634 (diff) | |
| download | sdk-b6049e3c93e27b943832ec300a6d9b04f4f6d474.tar.gz sdk-b6049e3c93e27b943832ec300a6d9b04f4f6d474.tar.bz2 sdk-b6049e3c93e27b943832ec300a6d9b04f4f6d474.zip | |
Change manifmerger & jobb to prebuilts.
Contrary to the ill-advised change Ic57371dcea, this will just fail
if the prebuilts are not present instead of trying to rebuilt them.
Change-Id: I019b0369686ae6ed5a507d05209ea68919174f97
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 5ace26d25..c5397435f 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 00e6474b7..f936d9635 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 |