aboutsummaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorRaphael Moll <ralf@android.com>2010-11-11 16:03:07 -0800
committerRaphael Moll <ralf@android.com>2010-11-11 19:34:43 -0800
commitfe21e0b6a47fc03d663d97a828454a1e9f11f9e3 (patch)
tree246e34d189afee0b8ac6df8c6e704348f719a6ad /build
parentc8c1b446ef2553d6a27de3687bb9ade87ceff8c9 (diff)
downloadsdk-fe21e0b6a47fc03d663d97a828454a1e9f11f9e3.zip
sdk-fe21e0b6a47fc03d663d97a828454a1e9f11f9e3.tar.gz
sdk-fe21e0b6a47fc03d663d97a828454a1e9f11f9e3.tar.bz2
Win SDK: Split the win-sdk makefile and script into 2 parts.
The main makefile+scripts to build the Windows SDK is still in development/build/tools. However it defers to a new matching set of files here in sdk/build to build and package things that depend on the sdk.git or external/qemu.git. This will make it easier for us to prepare SDKs based on a tools_rN branch that isn't cut at the same time than the platform branch. This is a multi-part changeset. The other part is in development.git. Change-Id: Ic94d261b16ad595101c6f83cd77055715b45a622
Diffstat (limited to 'build')
-rwxr-xr-xbuild/patch_windows_sdk.sh51
-rw-r--r--build/windows_sdk_tools.mk10
2 files changed, 61 insertions, 0 deletions
diff --git a/build/patch_windows_sdk.sh b/build/patch_windows_sdk.sh
new file mode 100755
index 0000000..bee15ce
--- /dev/null
+++ b/build/patch_windows_sdk.sh
@@ -0,0 +1,51 @@
+#!/bin/bash
+
+# This file is included by development.git/tools/build/patch_windows_sdk.sh.
+# Please see the details in the other file.
+
+
+# Verbose by default. Use -q to make more silent.
+V="-v"
+if [[ "$1" == "-q" ]]; then
+ V=""
+ shift
+fi
+
+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,emulator}
+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/
+
+# 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/
+
diff --git a/build/windows_sdk_tools.mk b/build/windows_sdk_tools.mk
new file mode 100644
index 0000000..8164cc5
--- /dev/null
+++ b/build/windows_sdk_tools.mk
@@ -0,0 +1,10 @@
+# Makefile to build the Windows SDK Tools under linux.
+#
+# This makefile is included by development/build/tools/windows_sdk.mk
+# to device which tools we want to build from the sdk.git project.
+
+WIN_SDK_TARGETS := \
+ emulator \
+ mksdcard \
+ sdklauncher
+