Merge "Use atree for the Windows SDK. Strip binaries."

3 files changed, 129 insertions, 50 deletions

diff --git a/build/patch_windows_sdk.sh b/build/patch_windows_sdk.sh
index 9dacce3..c80f2e4 100755
--- a/build/patch_windows_sdk.sh
+++ b/build/patch_windows_sdk.sh
@@ -1,4 +1,20 @@
 #!/bin/bash
+#
+# Copyright (C) 2009 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 
 # This file is run by development/tools/build/windows_sdk.mk right
 # after development.git/tools/build/patch_windows_sdk.sh.
@@ -19,41 +35,9 @@ TEMP_SDK_DIR=$1
 WIN_OUT_DIR=$2
 TOPDIR=${TOPDIR:-$3}
 
-# Remove obsolete stuff from tools
-TOOLS=$TEMP_SDK_DIR/tools
-LIB=$TEMP_SDK_DIR/tools/lib
-rm $V $TOOLS/{android,apkbuilder,ddms,draw9patch}
-rm $V $TOOLS/{emulator,emulator-arm,emulator-x86}
-rm $V $TOOLS/lib/{libOpenglRender.so,libGLES_CM_translator.so,libGLES_V2_translator.so,libEGL_translator.so}
-rm $V $TOOLS/{hierarchyviewer,layoutopt,mksdcard,traceview,monkeyrunner}
-rm $V $TOOLS/proguard/bin/*.sh
-
-# Copy all the new stuff in tools
-# Note: keep this line here, just to remind us this is already done by the
-# script in development.git/tools/build/patch_windows_sdk.sh. This will
-# be obsolete when we switch to an .atree format.
-# -- cp $V $WIN_OUT_DIR/host/windows-x86/bin/*.{exe,dll} $TOOLS/
-
-cp $V $WIN_OUT_DIR/host/windows-x86/lib/lib*.dll $LIB
-
-# Copy the SDK Manager (aka sdklauncher) to the root of the SDK (it was copied in tools above)
-# and move it also in SDK/tools/lib (so that tools updates can update the root one too)
-cp $TOOLS/sdklauncher.exe $TEMP_SDK_DIR/"SDK Manager.exe"
-mv $TOOLS/sdklauncher.exe $LIB/"SDK Manager.exe"
-
-# Copy the emulator NOTICE in the tools dir
-cp $V ${TOPDIR}external/qemu/NOTICE $TOOLS/emulator_NOTICE.txt
-
-# Update a bunch of bat files
-cp $V ${TOPDIR}sdk/files/post_tools_install.bat                 $LIB/
-cp $V ${TOPDIR}sdk/files/find_java.bat                          $LIB/
-cp $V ${TOPDIR}sdk/apkbuilder/etc/apkbuilder.bat                $TOOLS/
-cp $V ${TOPDIR}sdk/ddms/app/etc/ddms.bat                        $TOOLS/
-cp $V ${TOPDIR}sdk/traceview/etc/traceview.bat                  $TOOLS/
-cp $V ${TOPDIR}sdk/hierarchyviewer2/app/etc/hierarchyviewer.bat $TOOLS/
-cp $V ${TOPDIR}sdk/layoutopt/app/etc/layoutopt.bat              $TOOLS/
-cp $V ${TOPDIR}sdk/draw9patch/etc/draw9patch.bat                $TOOLS/
-cp $V ${TOPDIR}sdk/sdkmanager/app/etc/android.bat               $TOOLS/
-cp $V ${TOPDIR}sdk/monkeyrunner/etc/monkeyrunner.bat            $TOOLS/
-cp $V ${TOPDIR}sdk/files/proguard/bin/*.bat                     $TOOLS/proguard/bin/
+# Invoke atree to copy the files
+atree -f ${TOPDIR}sdk/build/tools.windows.atree \
+      -I $WIN_OUT_DIR/host/windows-x86 \
+      -I ${TOPDIR:-.} \
+      -o $TEMP_SDK_DIR
 
diff --git a/build/tools.atree b/build/tools.atree
index 978615f..56be5b5 100644
--- a/build/tools.atree
+++ b/build/tools.atree
@@ -32,26 +32,26 @@ sdk/files/plugin.prop tools/lib/plugin.prop
 sdk/files/adb_has_moved.txt tools/adb_has_moved.txt
 
 # native host tools from out/host/$(HOST_OS)-$(HOST_ARCH)/
-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
+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                         tools/emulator
-bin/emulator-x86                     tools/emulator-x86
-bin/emulator-arm                     tools/emulator-arm
+bin/emulator                         strip tools/emulator
+bin/emulator-x86                     strip tools/emulator-x86
+bin/emulator-arm                     strip tools/emulator-arm
 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
 
 # OpenGLES emulation libraries
-lib/libOpenglRender${DLL_EXTENSION}       tools/lib/libOpenglRender${DLL_EXTENSION}
-lib/libGLES_CM_translator${DLL_EXTENSION} tools/lib/libGLES_CM_translator${DLL_EXTENSION}
-lib/libGLES_V2_translator${DLL_EXTENSION} tools/lib/libGLES_V2_translator${DLL_EXTENSION}
-lib/libEGL_translator${DLL_EXTENSION}     tools/lib/libEGL_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}
 
 # Java-Based SDK Tools
 bin/ddms            tools/ddms
diff --git a/build/tools.windows.atree b/build/tools.windows.atree
new file mode 100755
index 0000000..a7640c2
--- /dev/null
+++ b/build/tools.windows.atree
@@ -0,0 +1,95 @@
+#
+# Copyright (C) 2011 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+#
+# These are the files that comprise the tools component of the Windows SDK.
+#
+
+rm tools/android
+sdk/sdkmanager/app/etc/android.bat                tools/android.bat
+
+rm tools/apkbuilder
+sdk/apkbuilder/etc/apkbuilder.bat                 tools/apkbuilder.bat
+
+rm tools/ddms
+sdk/ddms/app/etc/ddms.bat                         tools/ddms.bat
+
+rm tools/dmtracedump
+bin/dmtracedump.exe                         strip tools/dmtracedump.exe
+
+rm tools/draw9patch
+sdk/draw9patch/etc/draw9patch.bat                 tools/draw9patch.bat
+
+rm tools/emulator
+rm tools/emulator-arm
+rm tools/emulator-x86
+bin/emulator.exe                            strip tools/emulator.exe
+bin/emulator-arm.exe                        strip tools/emulator-arm.exe
+bin/emulator-x86.exe                        strip tools/emulator-x86.exe
+# Emulator libraries
+rm tools/lib/libOpenglRender.so
+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
+# Copy the emulator NOTICE in the tools dir
+external/qemu/NOTICE                              tools/emulator_NOTICE.txt
+
+rm tools/etc1tool
+bin/etc1tool.exe                            strip tools/etc1tool.exe
+
+rm tools/hierarchyviewer
+sdk/hierarchyviewer2/app/etc/hierarchyviewer.bat  tools/hierarchyviewer.bat
+
+rm tools/hprof-conv
+bin/hprof-conv.exe                          strip tools/hprov-conv.exe
+
+rm tools/layoutopt
+sdk/layoutopt/app/etc/layoutopt.bat               tools/layoutopt.bat
+
+rm tools/mksdcard
+bin/mksdcard.exe                            strip tools/mksdcard.exe
+
+rm tools/monkeyrunner
+sdk/monkeyrunner/etc/monkeyrunner.bat             tools/monkeyrunner.bat
+
+rm tools/proguard/bin
+sdk/files/proguard/bin/proguard.bat               tools/proguard/bin/proguard.bat
+sdk/files/proguard/bin/proguardgui.bat            tools/proguard/bin/proguardgui.bat
+sdk/files/proguard/bin/retrace.bat                tools/proguard/bin/retrace.bat
+
+rm tools/sqlite3
+bin/sqlite3.exe                             strip tools/sqlite3.exe
+
+rm tools/traceview
+sdk/traceview/etc/traceview.bat                   tools/traceview.bat
+
+rm tools/zipalign
+bin/zipalign.exe                            strip tools/zipalign.exe
+
+
+# Copy the SDK Manager (aka sdklauncher) to the root of the SDK as well
+# as in SDK/tools/lib (so that tools updates can update the root one too)
+bin/sdklauncher.exe              "SDK Manager.exe"
+/bin/sdklauncher.exe              "tools/lib/SDK Manager.exe"
+
+# Supporting bat files
+sdk/files/post_tools_install.bat                  tools/lib/post_tools_install.bat
+sdk/files/find_java.bat                           tools/lib/find_java.bat
+