Merge "SDK prebuilts: reorganize into tools/lib."
diff --git a/assetstudio/Android.mk b/assetstudio/Android.mk
index 17f9415..19e2d3c 100644
--- a/assetstudio/Android.mk
+++ b/assetstudio/Android.mk
@@ -34,7 +34,7 @@
LOCAL_JAR_MANIFEST := etc/manifest.txt
LOCAL_PREBUILT_JAVA_LIBRARIES := \
- ../../prebuilts/devtools/$(LOCAL_MODULE)$(COMMON_JAVA_PACKAGE_SUFFIX)
+ ../../prebuilts/devtools/tools/lib/$(LOCAL_MODULE)$(COMMON_JAVA_PACKAGE_SUFFIX)
include $(BUILD_HOST_PREBUILT)
diff --git a/build/tools.atree b/build/tools.atree
index b5a7edd..6772d69 100644
--- a/build/tools.atree
+++ b/build/tools.atree
@@ -23,107 +23,107 @@
##############################################################################
# version files for the SDK updater, from sdk.git
-sdk/files/tools_source.properties tools/source.properties
+sdk/files/tools_source.properties tools/source.properties
# copy plugin.prop from sdk.git
-sdk/files/plugin.prop tools/lib/plugin.prop
+sdk/files/plugin.prop tools/lib/plugin.prop
# readme regarding adb move to platform-tools
-sdk/files/adb_has_moved.txt tools/adb_has_moved.txt
+sdk/files/adb_has_moved.txt tools/adb_has_moved.txt
# native host tools from out/host/$(HOST_OS)-$(HOST_ARCH)/
-bin/sqlite3 strip tools/sqlite3
-bin/dmtracedump strip tools/dmtracedump
-bin/etc1tool strip tools/etc1tool
-bin/hprof-conv strip tools/hprof-conv
-bin/mksdcard strip tools/mksdcard
-bin/zipalign strip tools/zipalign
+bin/sqlite3 strip tools/sqlite3
+bin/dmtracedump strip tools/dmtracedump
+bin/etc1tool strip tools/etc1tool
+bin/hprof-conv strip tools/hprof-conv
+bin/mksdcard strip tools/mksdcard
+bin/zipalign strip tools/zipalign
# emulator
-bin/emulator strip tools/emulator
-bin/emulator-x86 strip tools/emulator-x86
-bin/emulator-arm strip tools/emulator-arm
-bin/emulator-mips strip tools/emulator-mips
-bin/emulator64-x86 strip tools/emulator64-x86
-bin/emulator64-arm strip tools/emulator64-arm
-bin/emulator64-mips strip tools/emulator64-mips
-sdk/emulator/snapshot/snapshots.img tools/lib/emulator/snapshots.img
-usr/share/pc-bios/bios.bin tools/lib/pc-bios/bios.bin
-usr/share/pc-bios/vgabios-cirrus.bin tools/lib/pc-bios/vgabios-cirrus.bin
-sdk/emulator/skins/dynamic tools/lib/emulator/skins/dynamic
+bin/emulator strip tools/emulator
+bin/emulator-x86 strip tools/emulator-x86
+bin/emulator-arm strip tools/emulator-arm
+bin/emulator-mips strip tools/emulator-mips
+bin/emulator64-x86 strip tools/emulator64-x86
+bin/emulator64-arm strip tools/emulator64-arm
+bin/emulator64-mips strip tools/emulator64-mips
+sdk/emulator/snapshot/snapshots.img tools/lib/emulator/snapshots.img
+usr/share/pc-bios/bios.bin tools/lib/pc-bios/bios.bin
+usr/share/pc-bios/vgabios-cirrus.bin tools/lib/pc-bios/vgabios-cirrus.bin
+sdk/emulator/skins/dynamic tools/lib/emulator/skins/dynamic
# OpenGLES emulation libraries
-lib/libOpenglRender${DLL_EXTENSION} strip tools/lib/libOpenglRender${DLL_EXTENSION}
-lib/libGLES_CM_translator${DLL_EXTENSION} strip tools/lib/libGLES_CM_translator${DLL_EXTENSION}
-lib/libGLES_V2_translator${DLL_EXTENSION} strip tools/lib/libGLES_V2_translator${DLL_EXTENSION}
-lib/libEGL_translator${DLL_EXTENSION} strip tools/lib/libEGL_translator${DLL_EXTENSION}
-lib/lib64OpenglRender${DLL_EXTENSION} strip tools/lib/lib64OpenglRender${DLL_EXTENSION}
-lib/lib64GLES_CM_translator${DLL_EXTENSION} strip tools/lib/lib64GLES_CM_translator${DLL_EXTENSION}
-lib/lib64GLES_V2_translator${DLL_EXTENSION} strip tools/lib/lib64GLES_V2_translator${DLL_EXTENSION}
-lib/lib64EGL_translator${DLL_EXTENSION} strip tools/lib/lib64EGL_translator${DLL_EXTENSION}
+lib/libOpenglRender${DLL_EXTENSION} strip tools/lib/libOpenglRender${DLL_EXTENSION}
+lib/libGLES_CM_translator${DLL_EXTENSION} strip tools/lib/libGLES_CM_translator${DLL_EXTENSION}
+lib/libGLES_V2_translator${DLL_EXTENSION} strip tools/lib/libGLES_V2_translator${DLL_EXTENSION}
+lib/libEGL_translator${DLL_EXTENSION} strip tools/lib/libEGL_translator${DLL_EXTENSION}
+lib/lib64OpenglRender${DLL_EXTENSION} strip tools/lib/lib64OpenglRender${DLL_EXTENSION}
+lib/lib64GLES_CM_translator${DLL_EXTENSION} strip tools/lib/lib64GLES_CM_translator${DLL_EXTENSION}
+lib/lib64GLES_V2_translator${DLL_EXTENSION} strip tools/lib/lib64GLES_V2_translator${DLL_EXTENSION}
+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/uiautomatorviewer tools/uiautomatorviewer
-prebuilts/devtools/etc/jobb tools/jobb
-prebuilts/devtools/etc/lint tools/lint
+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/uiautomatorviewer tools/uiautomatorviewer
+prebuilts/devtools/tools/jobb tools/jobb
+prebuilts/devtools/tools/lint tools/lint
# sdk.git Ant templates for project build files
-sdk/templates/build.template tools/lib/build.template
-sdk/templates/uibuild.template tools/lib/uibuild.template
-sdk/files/proguard-project.txt tools/lib/proguard-project.txt
-sdk/files/proguard-android.txt tools/proguard/proguard-android.txt
-sdk/files/proguard-android-optimize.txt tools/proguard/proguard-android-optimize.txt
+sdk/templates/build.template tools/lib/build.template
+sdk/templates/uibuild.template tools/lib/uibuild.template
+sdk/files/proguard-project.txt tools/lib/proguard-project.txt
+sdk/files/proguard-android.txt tools/proguard/proguard-android.txt
+sdk/files/proguard-android-optimize.txt tools/proguard/proguard-android-optimize.txt
# Ant Build Rules
-sdk/files/ant tools/ant
-sdk/files/sdk_files_NOTICE.txt tools/ant/NOTICE.txt
+sdk/files/ant tools/ant
+sdk/files/sdk_files_NOTICE.txt tools/ant/NOTICE.txt
# layout device definition
-sdk/files/devices.xml tools/lib/devices.xml
+sdk/files/devices.xml tools/lib/devices.xml
# AVD Hardware property list
-external/qemu/android/avd/hardware-properties.ini tools/lib/hardware-properties.ini
+external/qemu/android/avd/hardware-properties.ini tools/lib/hardware-properties.ini
# emacs support from sdk.git
sdk/files/android.el tools/lib/android.el
# Java Libraries for the tools
-prebuilts/devtools/common.jar tools/lib/common.jar
-prebuilts/devtools/swtmenubar.jar tools/lib/swtmenubar.jar
-sdk/apkbuilder/etc/apkbuilder tools/apkbuilder
-framework/sdkstats.jar tools/lib/sdkstats.jar
-framework/archquery.jar tools/lib/archquery.jar
-framework/ddms.jar tools/lib/ddms.jar
-prebuilts/devtools/ddmlib.jar tools/lib/ddmlib.jar
-framework/ddmuilib.jar tools/lib/ddmuilib.jar
-framework/hierarchyviewer2.jar tools/lib/hierarchyviewer2.jar
-framework/hierarchyviewerlib.jar tools/lib/hierarchyviewerlib.jar
-framework/draw9patch.jar tools/lib/draw9patch.jar
-framework/traceview.jar tools/lib/traceview.jar
-framework/anttasks.jar tools/lib/anttasks.jar
-prebuilts/devtools/sdklib.jar tools/lib/sdklib.jar
-prebuilts/devtools/sdkuilib.jar tools/lib/sdkuilib.jar
-framework/sdkmanager.jar tools/lib/sdkmanager.jar
-framework/monkeyrunner.jar tools/lib/monkeyrunner.jar
-framework/chimpchat.jar tools/lib/chimpchat.jar
-framework/guava-tools.jar tools/lib/guava-tools.jar
-framework/jsilver.jar tools/lib/jsilver.jar
-framework/jython.jar tools/lib/jython.jar
-prebuilts/devtools/lint.jar tools/lib/lint.jar
-prebuilts/devtools/lint_api.jar tools/lib/lint_api.jar
-prebuilts/devtools/lint_checks.jar tools/lib/lint_checks.jar
-prebuilts/devtools/manifmerger.jar tools/lib/manifmerger.jar
-prebuilts/devtools/dvlib.jar tools/lib/dvlib.jar
-prebuilts/devtools/layoutlib_api.jar tools/lib/layoutlib_api.jar
-framework/uiautomatorviewer.jar tools/lib/uiautomatorviewer.jar
-prebuilts/devtools/jobb.jar tools/lib/jobb.jar
-framework/fat32lib.jar tools/lib/fat32lib.jar
+prebuilts/devtools/tools/lib/common.jar tools/lib/common.jar
+prebuilts/devtools/tools/lib/swtmenubar.jar tools/lib/swtmenubar.jar
+sdk/apkbuilder/etc/apkbuilder tools/apkbuilder
+framework/sdkstats.jar tools/lib/sdkstats.jar
+framework/archquery.jar tools/lib/archquery.jar
+framework/ddms.jar tools/lib/ddms.jar
+prebuilts/devtools/tools/lib/ddmlib.jar tools/lib/ddmlib.jar
+framework/ddmuilib.jar tools/lib/ddmuilib.jar
+framework/hierarchyviewer2.jar tools/lib/hierarchyviewer2.jar
+framework/hierarchyviewerlib.jar tools/lib/hierarchyviewerlib.jar
+framework/draw9patch.jar tools/lib/draw9patch.jar
+framework/traceview.jar tools/lib/traceview.jar
+framework/anttasks.jar tools/lib/anttasks.jar
+prebuilts/devtools/tools/lib/sdklib.jar tools/lib/sdklib.jar
+prebuilts/devtools/tools/lib/sdkuilib.jar tools/lib/sdkuilib.jar
+framework/sdkmanager.jar tools/lib/sdkmanager.jar
+framework/monkeyrunner.jar tools/lib/monkeyrunner.jar
+framework/chimpchat.jar tools/lib/chimpchat.jar
+framework/guava-tools.jar tools/lib/guava-tools.jar
+framework/jsilver.jar tools/lib/jsilver.jar
+framework/jython.jar tools/lib/jython.jar
+prebuilts/devtools/tools/lib/lint.jar tools/lib/lint.jar
+prebuilts/devtools/tools/lib/lint_api.jar tools/lib/lint_api.jar
+prebuilts/devtools/tools/lib/lint_checks.jar tools/lib/lint_checks.jar
+prebuilts/devtools/tools/lib/manifmerger.jar tools/lib/manifmerger.jar
+prebuilts/devtools/tools/lib/dvlib.jar tools/lib/dvlib.jar
+prebuilts/devtools/tools/lib/layoutlib_api.jar tools/lib/layoutlib_api.jar
+framework/uiautomatorviewer.jar tools/lib/uiautomatorviewer.jar
+prebuilts/devtools/tools/lib/jobb.jar tools/lib/jobb.jar
+framework/fat32lib.jar tools/lib/fat32lib.jar
prebuilts/tools/common/mkidentity/mkidentity-prebuilt.jar tools/lib/mkidentity.jar
# 3rd Party java libraries
@@ -163,31 +163,31 @@
prebuilts/tools/common/proguard/proguard4.7/src/proguard/ant/task.properties tools/proguard/ant/task.properties
# Templates
-sdk/templates/projects tools/templates/projects
-sdk/templates/activities tools/templates/activities
-sdk/templates/other tools/templates/other
+sdk/templates/projects tools/templates/projects
+sdk/templates/activities tools/templates/activities
+sdk/templates/other tools/templates/other
# SDK Controller
-sdk/apps/SdkController tools/apps/SdkController
+sdk/apps/SdkController tools/apps/SdkController
# tools specific support jar
-framework/annotations.jar tools/support/annotations.jar
+framework/annotations.jar tools/support/annotations.jar
# systrace
-external/chromium-trace/systrace.py tools/systrace/systrace.py
-external/chromium-trace/script.js tools/systrace/script.js
-external/chromium-trace/style.css tools/systrace/style.css
-external/chromium-trace/LICENSE tools/systrace/LICENSE
-external/chromium-trace/AUTHORS tools/systrace/AUTHORS
-external/chromium-trace/NOTICE tools/systrace/NOTICE
+external/chromium-trace/systrace.py tools/systrace/systrace.py
+external/chromium-trace/script.js tools/systrace/script.js
+external/chromium-trace/style.css tools/systrace/style.css
+external/chromium-trace/LICENSE tools/systrace/LICENSE
+external/chromium-trace/AUTHORS tools/systrace/AUTHORS
+external/chromium-trace/NOTICE tools/systrace/NOTICE
# Misspelling databases for lint
-sdk/files/typos tools/support
+sdk/files/typos tools/support
##############################################################################
# Tests Component
##############################################################################
-sdk/testapps tests/testapps
-framework/ninepatch-tests.jar tests/libtests/ninepatch-tests.jar
+sdk/testapps tests/testapps
+framework/ninepatch-tests.jar tests/libtests/ninepatch-tests.jar
diff --git a/build/tools.windows.atree b/build/tools.windows.atree
index 3a84ff8..f64b374 100755
--- a/build/tools.windows.atree
+++ b/build/tools.windows.atree
@@ -37,10 +37,10 @@
sdk/draw9patch/etc/draw9patch.bat tools/draw9patch.bat
rm tools/lint
-prebuilts/devtools/etc/lint.bat tools/lint.bat
+prebuilts/devtools/tools/lint.bat tools/lint.bat
rm tools/jobb
-prebuilts/devtools/etc/jobb.bat tools/jobb.bat
+prebuilts/devtools/tools/jobb.bat tools/jobb.bat
rm tools/emulator
@@ -56,10 +56,10 @@
rm tools/lib/libGLES_CM_translator.so
rm tools/lib/libGLES_V2_translator.so
rm tools/lib/libEGL_translator.so
-lib/libOpenglRender.dll tools/lib/libOpenglRender.dll
-lib/libGLES_CM_translator.dll tools/lib/libGLES_CM_translator.dll
-lib/libGLES_V2_translator.dll tools/lib/libGLES_V2_translator.dll
-lib/libEGL_translator.dll tools/lib/libEGL_translator.dll
+lib/libOpenglRender.dll tools/lib/libOpenglRender.dll
+lib/libGLES_CM_translator.dll tools/lib/libGLES_CM_translator.dll
+lib/libGLES_V2_translator.dll tools/lib/libGLES_V2_translator.dll
+lib/libEGL_translator.dll tools/lib/libEGL_translator.dll
# Copy the emulator NOTICE in the tools dir
external/qemu/NOTICE tools/emulator_NOTICE.txt
diff --git a/common/Android.mk b/common/Android.mk
index dc098fd..f7ba3c1 100644
--- a/common/Android.mk
+++ b/common/Android.mk
@@ -30,7 +30,7 @@
LOCAL_MODULE_TAGS := optional
LOCAL_PREBUILT_JAVA_LIBRARIES := \
- ../../prebuilts/devtools/$(LOCAL_MODULE)$(COMMON_JAVA_PACKAGE_SUFFIX)
+ ../../prebuilts/devtools/tools/lib/$(LOCAL_MODULE)$(COMMON_JAVA_PACKAGE_SUFFIX)
include $(BUILD_HOST_PREBUILT)
diff --git a/ddms/libs/ddmlib/Android.mk b/ddms/libs/ddmlib/Android.mk
index c5ad99e..74ee46a 100644
--- a/ddms/libs/ddmlib/Android.mk
+++ b/ddms/libs/ddmlib/Android.mk
@@ -26,7 +26,7 @@
LOCAL_JAVA_LIBRARIES := kxml2-2.3.0
LOCAL_PREBUILT_JAVA_LIBRARIES := \
- ../../../../prebuilts/devtools/$(LOCAL_MODULE)$(COMMON_JAVA_PACKAGE_SUFFIX)
+ ../../../../prebuilts/devtools/tools/lib/$(LOCAL_MODULE)$(COMMON_JAVA_PACKAGE_SUFFIX)
include $(BUILD_HOST_PREBUILT)
diff --git a/device_validator/dvlib/Android.mk b/device_validator/dvlib/Android.mk
index 8d07043..658c69b 100644
--- a/device_validator/dvlib/Android.mk
+++ b/device_validator/dvlib/Android.mk
@@ -27,7 +27,7 @@
LOCAL_MODULE_TAGS := optional
LOCAL_PREBUILT_JAVA_LIBRARIES := \
- ../../../prebuilts/devtools/$(LOCAL_MODULE)$(COMMON_JAVA_PACKAGE_SUFFIX)
+ ../../../prebuilts/devtools/tools/lib/$(LOCAL_MODULE)$(COMMON_JAVA_PACKAGE_SUFFIX)
include $(BUILD_HOST_PREBUILT)
diff --git a/eclipse/scripts/create_all_symlinks.sh b/eclipse/scripts/create_all_symlinks.sh
index 8f48fb7..ec738dc 100755
--- a/eclipse/scripts/create_all_symlinks.sh
+++ b/eclipse/scripts/create_all_symlinks.sh
@@ -225,7 +225,7 @@
LIBS2=""
for LIB in $LIBS; do
- J="prebuilts/devtools/$LIB.jar"
+ J="prebuilts/devtools/tools/lib/$LIB.jar"
if [[ -f $J ]]; then
warn "## Using existing $J"
else
@@ -271,7 +271,7 @@
if [[ ! -f "$SRC" ]]; then
ORIG_SRC="$SRC"
# Take a prebuilts/devtools instead of a framework one if possible.
- SRC="prebuilts/devtools/$SRC.jar"
+ SRC="prebuilts/devtools/tools/lib/$SRC.jar"
if [[ ! -f "$SRC" ]]; then
SRC="out/host/$PLATFORM/framework/$ORIG_SRC.jar"
fi
diff --git a/jobb/Android.mk b/jobb/Android.mk
index 1a58732..2750830 100644
--- a/jobb/Android.mk
+++ b/jobb/Android.mk
@@ -23,7 +23,7 @@
LOCAL_JAVA_LIBRARIES := fat32lib
LOCAL_PREBUILT_JAVA_LIBRARIES := \
- ../../prebuilts/devtools/$(LOCAL_MODULE)$(COMMON_JAVA_PACKAGE_SUFFIX)
+ ../../prebuilts/devtools/tools/lib/$(LOCAL_MODULE)$(COMMON_JAVA_PACKAGE_SUFFIX)
include $(BUILD_HOST_PREBUILT)
diff --git a/layoutlib_api/Android.mk b/layoutlib_api/Android.mk
index 169cf37..e03b7dc 100644
--- a/layoutlib_api/Android.mk
+++ b/layoutlib_api/Android.mk
@@ -29,7 +29,7 @@
LOCAL_MODULE := layoutlib_api
LOCAL_PREBUILT_JAVA_LIBRARIES := \
- ../../prebuilts/devtools/$(LOCAL_MODULE)$(COMMON_JAVA_PACKAGE_SUFFIX)
+ ../../prebuilts/devtools/tools/lib/$(LOCAL_MODULE)$(COMMON_JAVA_PACKAGE_SUFFIX)
include $(BUILD_HOST_PREBUILT)
diff --git a/lint/cli/Android.mk b/lint/cli/Android.mk
index 00c736b..0f29dae 100644
--- a/lint/cli/Android.mk
+++ b/lint/cli/Android.mk
@@ -36,7 +36,7 @@
LOCAL_MODULE_TAGS := optional
LOCAL_PREBUILT_JAVA_LIBRARIES := \
- ../../../prebuilts/devtools/$(LOCAL_MODULE)$(COMMON_JAVA_PACKAGE_SUFFIX)
+ ../../../prebuilts/devtools/tools/lib/$(LOCAL_MODULE)$(COMMON_JAVA_PACKAGE_SUFFIX)
include $(BUILD_HOST_PREBUILT)
diff --git a/lint/libs/lint_api/Android.mk b/lint/libs/lint_api/Android.mk
index 3510559..e30db14 100644
--- a/lint/libs/lint_api/Android.mk
+++ b/lint/libs/lint_api/Android.mk
@@ -34,7 +34,7 @@
LOCAL_MODULE_TAGS := optional
LOCAL_PREBUILT_JAVA_LIBRARIES := \
- ../../../../prebuilts/devtools/$(LOCAL_MODULE)$(COMMON_JAVA_PACKAGE_SUFFIX)
+ ../../../../prebuilts/devtools/tools/lib/$(LOCAL_MODULE)$(COMMON_JAVA_PACKAGE_SUFFIX)
include $(BUILD_HOST_PREBUILT)
diff --git a/lint/libs/lint_checks/Android.mk b/lint/libs/lint_checks/Android.mk
index 1382715..4229820 100644
--- a/lint/libs/lint_checks/Android.mk
+++ b/lint/libs/lint_checks/Android.mk
@@ -37,7 +37,7 @@
LOCAL_MODULE_TAGS := optional
LOCAL_PREBUILT_JAVA_LIBRARIES := \
- ../../../../prebuilts/devtools/$(LOCAL_MODULE)$(COMMON_JAVA_PACKAGE_SUFFIX)
+ ../../../../prebuilts/devtools/tools/lib/$(LOCAL_MODULE)$(COMMON_JAVA_PACKAGE_SUFFIX)
include $(BUILD_HOST_PREBUILT)
diff --git a/manifmerger/Android.mk b/manifmerger/Android.mk
index b07af36..a9b4915 100644
--- a/manifmerger/Android.mk
+++ b/manifmerger/Android.mk
@@ -26,7 +26,7 @@
LOCAL_JAVA_LIBRARIES := common sdklib
LOCAL_PREBUILT_JAVA_LIBRARIES := \
- ../../prebuilts/devtools/$(LOCAL_MODULE)$(COMMON_JAVA_PACKAGE_SUFFIX)
+ ../../prebuilts/devtools/tools/lib/$(LOCAL_MODULE)$(COMMON_JAVA_PACKAGE_SUFFIX)
include $(BUILD_HOST_PREBUILT)
diff --git a/sdk_common/Android.mk b/sdk_common/Android.mk
index 17c78cb..1550052 100644
--- a/sdk_common/Android.mk
+++ b/sdk_common/Android.mk
@@ -33,7 +33,7 @@
LOCAL_MODULE_TAGS := optional
LOCAL_PREBUILT_JAVA_LIBRARIES := \
- ../../prebuilts/devtools/$(LOCAL_MODULE)$(COMMON_JAVA_PACKAGE_SUFFIX)
+ ../../prebuilts/devtools/tools/lib/$(LOCAL_MODULE)$(COMMON_JAVA_PACKAGE_SUFFIX)
include $(BUILD_HOST_PREBUILT)
diff --git a/sdkmanager/libs/sdklib/Android.mk b/sdkmanager/libs/sdklib/Android.mk
index ef0362d..c24fc5a 100644
--- a/sdkmanager/libs/sdklib/Android.mk
+++ b/sdkmanager/libs/sdklib/Android.mk
@@ -39,7 +39,7 @@
layoutlib_api
LOCAL_PREBUILT_JAVA_LIBRARIES := \
- ../../../../prebuilts/devtools/$(LOCAL_MODULE)$(COMMON_JAVA_PACKAGE_SUFFIX)
+ ../../../../prebuilts/devtools/tools/lib/$(LOCAL_MODULE)$(COMMON_JAVA_PACKAGE_SUFFIX)
include $(BUILD_HOST_PREBUILT)
diff --git a/sdkmanager/libs/sdkuilib/Android.mk b/sdkmanager/libs/sdkuilib/Android.mk
index df35432..155da45 100644
--- a/sdkmanager/libs/sdkuilib/Android.mk
+++ b/sdkmanager/libs/sdkuilib/Android.mk
@@ -42,7 +42,7 @@
swtmenubar
LOCAL_PREBUILT_JAVA_LIBRARIES := \
- ../../../../prebuilts/devtools/$(LOCAL_MODULE)$(COMMON_JAVA_PACKAGE_SUFFIX)
+ ../../../../prebuilts/devtools/tools/lib/$(LOCAL_MODULE)$(COMMON_JAVA_PACKAGE_SUFFIX)
include $(BUILD_HOST_PREBUILT)
diff --git a/swtmenubar/Android.mk b/swtmenubar/Android.mk
index 01e8645..699eeb3 100644
--- a/swtmenubar/Android.mk
+++ b/swtmenubar/Android.mk
@@ -26,7 +26,7 @@
org.eclipse.jface_3.6.2.M20110210-1200
LOCAL_PREBUILT_JAVA_LIBRARIES := \
- ../../prebuilts/devtools/$(LOCAL_MODULE)$(COMMON_JAVA_PACKAGE_SUFFIX)
+ ../../prebuilts/devtools/tools/lib/$(LOCAL_MODULE)$(COMMON_JAVA_PACKAGE_SUFFIX)
include $(BUILD_HOST_PREBUILT)
