From 476edbaae4f458ec8283955872481bd2565ed5b3 Mon Sep 17 00:00:00 2001 From: Raphael Date: Sat, 22 Oct 2011 23:41:13 -0700 Subject: [PATCH] Merge "SDK: package fastboot in platform-tools on 3 OSes." Do not merge. SDK Bug: 21115 (cherry picked from commit 94a55ddf0b12940c019b8275cbc5413616e7f1ae) Change-Id: I7c61bd171d85a52fdb0ac21bd2861f3d474eb4dc --- build/sdk-windows-x86.atree | 2 ++ build/sdk.atree | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/build/sdk-windows-x86.atree b/build/sdk-windows-x86.atree index 68105a2d0..3144b2711 100644 --- a/build/sdk-windows-x86.atree +++ b/build/sdk-windows-x86.atree @@ -27,7 +27,9 @@ # rm platform-tools/adb +rm platform-tools/fastboot bin/adb.exe strip platform-tools/adb.exe +bin/fastboot.exe strip platform-tools/fastboot.exe bin/AdbWinUsbApi.dll platform-tools/AdbWinUsbApi.dll bin/AdbWinApi.dll platform-tools/AdbWinApi.dll diff --git a/build/sdk.atree b/build/sdk.atree index 148899b52..323ffcff3 100644 --- a/build/sdk.atree +++ b/build/sdk.atree @@ -43,6 +43,7 @@ development/sdk/plat_tools_source.properties platform-tools/source.properties bin/adb strip platform-tools/adb bin/aapt strip platform-tools/aapt bin/aidl strip platform-tools/aidl +bin/fastboot strip platform-tools/fastboot bin/llvm-rs-cc strip platform-tools/llvm-rs-cc # dx @@ -50,7 +51,6 @@ bin/dx platform-tools/dx bin/dexdump platform-tools/dexdump framework/dx.jar platform-tools/lib/dx.jar - # Framework include for Renderscript frameworks/base/libs/rs/scriptc platform-tools/renderscript/include external/clang/lib/Headers platform-tools/renderscript/clang-include