am 476edbaa: Merge "SDK: package fastboot in platform-tools on 3 OSes." Do not merge.

* commit '476edbaae4f458ec8283955872481bd2565ed5b3':
  Merge "SDK: package fastboot in platform-tools on 3 OSes." Do not merge.
This commit is contained in:
Raphael
2011-12-13 11:31:34 -08:00
committed by Android Git Automerger
2 changed files with 3 additions and 1 deletions

View File

@@ -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

View File

@@ -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