Integrate sdk.atree changes from master. DO NOT MERGE
- Move adb to the platform-tools.
- Update the windows build for it.
- Split the tools component from sdk.atre into sdk/build/tools.atree
Change-Id: I75608f12d6e1d8bc0f470e3ca26c7e550cfdcbd6
diff --git a/build/sdk.atree b/build/sdk.atree
index 73bf0bc..3765929 100644
--- a/build/sdk.atree
+++ b/build/sdk.atree
@@ -15,7 +15,12 @@
#
#
-# These are the files that comprise that SDK
+# These are the files that comprise that SDK.
+#
+# The files that will go in the tools folder are setup through
+# sdk/build/tools.atree
+# This is to help when the sdk.git project is branched differently from
+# the other projects.
#
##############################################################################
@@ -29,93 +34,11 @@
frameworks/base/docs/docs-redirect.html documentation.html
##############################################################################
-# Tools Component
-##############################################################################
-
-# version files for the SDK updater, from sdk.git
-sdk/files/tools_source.properties tools/source.properties
-
-# copy plugin.prop from sdk.git
-sdk/files/plugin.prop tools/lib/plugin.prop
-
-# native host tools from out/host/$(HOST_OS)-$(HOST_ARCH)/
-bin/adb tools/adb
-bin/sqlite3 tools/sqlite3
-bin/dmtracedump tools/dmtracedump
-bin/etc1tool tools/etc1tool
-bin/hprof-conv tools/hprof-conv
-bin/mksdcard tools/mksdcard
-bin/zipalign tools/zipalign
-
-# emulator
-bin/emulator tools/emulator
-
-# Java-Based SDK Tools
-bin/ddms tools/ddms
-bin/hierarchyviewer tools/hierarchyviewer
-bin/draw9patch tools/draw9patch
-bin/layoutopt tools/layoutopt
-bin/traceview tools/traceview
-bin/android tools/android
-
-
-# sdk.git Ant templates for project build files
-sdk/templates/build.template tools/lib/build.template
-sdk/templates/build.export.template tools/lib/build.export.template
-
-# Ant Build Rules
-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
-
-# AVD Hardware property list
-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
-framework/androidprefs.jar tools/lib/androidprefs.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
-framework/ddmlib.jar tools/lib/ddmlib.jar
-framework/ddmuilib.jar tools/lib/ddmuilib.jar
-framework/hierarchyviewer.jar tools/lib/hierarchyviewer.jar
-framework/draw9patch.jar tools/lib/draw9patch.jar
-framework/layoutopt.jar tools/lib/layoutopt.jar
-framework/uix.jar tools/lib/uix.jar
-framework/traceview.jar tools/lib/traceview.jar
-framework/anttasks.jar tools/lib/anttasks.jar
-framework/sdklib.jar tools/lib/sdklib.jar
-framework/sdkuilib.jar tools/lib/sdkuilib.jar
-framework/sdkmanager.jar tools/lib/sdkmanager.jar
-
-# 3rd Party java libraries
-framework/swing-worker-1.1.jar tools/lib/swing-worker-1.1.jar
-framework/groovy-all-1.7.0.jar tools/lib/groovy-all-1.7.0.jar
-framework/commons-compress-1.0.jar tools/lib/commons-compress-1.0.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
-framework/org-netbeans-api-visual.jar tools/lib/org-netbeans-api-visual.jar
-framework/org-openide-util.jar tools/lib/org-openide-util.jar
-framework/jcommon-1.0.12.jar tools/lib/jcommon-1.0.12.jar
-framework/jfreechart-1.0.9.jar tools/lib/jfreechart-1.0.9.jar
-framework/jfreechart-1.0.9-swt.jar tools/lib/jfreechart-1.0.9-swt.jar
-framework/org.eclipse.core.commands_3.4.0.I20080509-2000.jar tools/lib/org.eclipse.core.commands_3.4.0.I20080509-2000.jar
-framework/org.eclipse.equinox.common_3.4.0.v20080421-2006.jar tools/lib/org.eclipse.equinox.common_3.4.0.v20080421-2006.jar
-framework/org.eclipse.jface_3.4.2.M20090107-0800.jar tools/lib/org.eclipse.jface_3.4.2.M20090107-0800.jar
-framework/osgi.jar tools/lib/osgi.jar
-
-##############################################################################
# Platform Tools Component
##############################################################################
# host tools from out/host/$(HOST_OS)-$(HOST_ARCH)/
+bin/adb platform-tools/adb
bin/aapt platform-tools/aapt
bin/aidl platform-tools/aidl
# dx
@@ -213,7 +136,6 @@
# Samples Component
##############################################################################
-
# samples to include in the sdk samples package
#
# the list here should match the list of samples that we generate docs for,
diff --git a/build/tools/patch_windows_sdk.sh b/build/tools/patch_windows_sdk.sh
index 1f3b5bd..edc8541 100755
--- a/build/tools/patch_windows_sdk.sh
+++ b/build/tools/patch_windows_sdk.sh
@@ -26,10 +26,10 @@
# Remove obsolete stuff from tools & platform
TOOLS=$TEMP_SDK_DIR/tools
LIB=$TEMP_SDK_DIR/tools/lib
-rm $V $TOOLS/{adb,android,apkbuilder,ddms,dmtracedump,draw9patch,emulator,etc1tool}
+rm $V $TOOLS/{android,apkbuilder,ddms,dmtracedump,draw9patch,emulator,etc1tool}
rm $V $TOOLS/{hierarchyviewer,hprof-conv,layoutopt,mksdcard,sqlite3,traceview,zipalign}
rm $V $LIB/*/swt.jar
-rm $V $PLATFORM_TOOLS/{aapt,aidl,dx,dexdump}
+rm $V $PLATFORM_TOOLS/{adb,aapt,aidl,dx,dexdump}
# Copy all the new stuff in tools
# Note: some tools are first copied here and then moved in platforms/<name>/tools/
@@ -80,7 +80,7 @@
cp -r $V ${TOPDIR}external/sonivox/jet_tools/JetCreator_content $JETDEMOCONTENT/
cp -r $V ${TOPDIR}external/sonivox/jet_tools/logic_templates $JETLOGICTEMPLATES/
chmod $V -R u+w $JETCREATOR # fixes an issue where Cygwin might copy the above as u+rx only
-cp $V ${TOPDIR}prebuilt/windows/jetcreator/EASDLL.dll $JETCREATOR/
+cp $V ${TOPDIR}prebuilt/windows/jetcreator/EASDLL.dll $JETCREATOR/
cp $V ${TOPDIR}external/sonivox/docs/JET_Authoring_Guidelines.html $JETDOC/
cp -r $V ${TOPDIR}external/sonivox/docs/JET_Authoring_Guidelines_files $JETDOC/
@@ -89,7 +89,7 @@
# Copy or move platform specific tools to the default platform.
cp $V ${TOPDIR}dalvik/dx/etc/dx.bat $PLATFORM_TOOLS/
-mv $V $TOOLS/{aapt.exe,aidl.exe,dexdump.exe} $PLATFORM_TOOLS/
+mv $V $TOOLS/{adb.exe,aapt.exe,aidl.exe,dexdump.exe} $TOOLS/Adb*.dll $PLATFORM_TOOLS/
# When building under cygwin, mgwz.dll must be both in SDK/tools for zipalign
# and in SDK/platform/XYZ/tools/ for aapt