diff options
| author | Raphaël Moll <ralf@android.com> | 2013-01-04 21:06:30 -0800 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-01-04 21:06:30 -0800 |
| commit | 4d69200e272697b788963c7f516d868c95d22634 (patch) | |
| tree | 91662ac1f41c62a18ced47cab83bdd368359c062 /build | |
| parent | fd9dfb6ab67dbfce76501f48c0be7db7990b6c9d (diff) | |
| parent | d87e0bf3c536371146923cc8755f33b2fb5a52b1 (diff) | |
| download | sdk-4d69200e272697b788963c7f516d868c95d22634.zip sdk-4d69200e272697b788963c7f516d868c95d22634.tar.gz sdk-4d69200e272697b788963c7f516d868c95d22634.tar.bz2 | |
Merge "Revert "SDK: Use prebuilds/devtools for manifmerger and jobb JAR libraries.""
Diffstat (limited to 'build')
| -rw-r--r-- | build/tools.atree | 20 | ||||
| -rwxr-xr-x | build/tools.windows.atree | 2 |
2 files changed, 12 insertions, 10 deletions
diff --git a/build/tools.atree b/build/tools.atree index c539743..5ace26d 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 -prebuilts/devtools/jobb/etc/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 +bin/jobb tools/jobb # sdk.git Ant templates for project build files sdk/templates/build.template tools/lib/build.template @@ -197,4 +197,6 @@ 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 f936d96..00e6474 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 -prebuilts/devtools/jobb/etc/jobb.bat tools/jobb.bat +sdk/jobb/etc/jobb.bat tools/jobb.bat rm tools/emulator |