summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoushik Dutta <koushd@gmail.com>2013-08-15 07:39:53 -0700
committerKoushik Dutta <koushd@gmail.com>2013-08-15 07:39:53 -0700
commit04243186aed656ccae13abeebbce95c404ed7bea (patch)
treeeb7276ca4c91c467a755ba4c89e38bd86c1f48d4
parent49cc929d0748fa62b42cef7b4dcfd372cafe891e (diff)
downloadandroid_development-04243186aed656ccae13abeebbce95c404ed7bea.tar.gz
android_development-04243186aed656ccae13abeebbce95c404ed7bea.tar.bz2
android_development-04243186aed656ccae13abeebbce95c404ed7bea.zip
Add heimdall
Change-Id: I31fbef5db425056178c78c217a3a6d6227ef3d36
-rwxr-xr-xbuild/tools/patch_windows_sdk.sh2
-rw-r--r--build/tools/windows_sdk.mk4
2 files changed, 4 insertions, 2 deletions
diff --git a/build/tools/patch_windows_sdk.sh b/build/tools/patch_windows_sdk.sh
index 7a930b0e7..08b45e7d5 100755
--- a/build/tools/patch_windows_sdk.sh
+++ b/build/tools/patch_windows_sdk.sh
@@ -86,7 +86,7 @@ fi
# Just to make it easier on the build servers, we want fastboot and adb
# (and its DLLs) next to the new SDK.
-for i in fastboot.exe adb.exe AdbWinApi.dll AdbWinUsbApi.dll; do
+for i in fastboot.exe adb.exe heimdall.exe AdbWinApi.dll AdbWinUsbApi.dll; do
cp -f $V $WIN_OUT_DIR/host/windows-x86/bin/$i $TEMP_SDK_DIR/../$i
done
diff --git a/build/tools/windows_sdk.mk b/build/tools/windows_sdk.mk
index 631f8463c..21d271cb8 100644
--- a/build/tools/windows_sdk.mk
+++ b/build/tools/windows_sdk.mk
@@ -38,10 +38,12 @@ WIN_TARGETS := \
etc1tool \
dexdump dmtracedump \
fastboot \
+ heimdall \
hprof-conv \
llvm-rs-cc \
prebuilt \
sqlite3 \
+ heimdall \
zipalign \
$(WIN_SDK_TARGETS)
@@ -81,7 +83,7 @@ win_sdk: $(WIN_SDK_ZIP)
winsdk-coretools: acp
$(call winsdk-banner,Build Windows Core Tools)
- $(hide) USE_MINGW=1 USE_CCACHE="" $(MAKE) PRODUCT-$(TARGET_PRODUCT)-$(strip adb fastboot) $(if $(hide),,showcommands)
+ $(hide) USE_MINGW=1 USE_CCACHE="" $(MAKE) PRODUCT-$(TARGET_PRODUCT)-$(strip adb fastboot heimdall) $(if $(hide),,showcommands)
winsdk-tools: $(WIN_BUILD_PREREQ)
$(call winsdk-banner,Build Windows Tools)