Merge "SDK: package fastboot in platform-tools on 3 OSes." Do not merge.
SDK Bug: 21115
(cherry picked from commit 94a55ddf0b)
Change-Id: I7c61bd171d85a52fdb0ac21bd2861f3d474eb4dc
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user