From 356a86a46aaefe528aed8de1bdfbd0faa7b9b571 Mon Sep 17 00:00:00 2001 From: Sergii Pechenizkyi Date: Thu, 30 Mar 2017 09:47:22 +0200 Subject: [PATCH] Update android-sdk (#31568) * Correct the emulator, lint, monkeyrunner binaries * Reuse build tools version * Added adb, fastboot, sqlite3, avdmanager binaries * Register build tools binaries (aapt, dx, etc) * Sorted declarations alphabetically --- Casks/android-sdk.rb | 41 +++++++++++++++++++++++++++-------------- 1 file changed, 27 insertions(+), 14 deletions(-) diff --git a/Casks/android-sdk.rb b/Casks/android-sdk.rb index 72ae8506b8c..a95d1b4b151 100644 --- a/Casks/android-sdk.rb +++ b/Casks/android-sdk.rb @@ -7,24 +7,37 @@ cask 'android-sdk' do name 'android-sdk' homepage 'https://developer.android.com/index.html' - binary "#{staged_path}/tools/bin/sdkmanager" + build_tools_version = '25.0.2' + + binary "#{staged_path}/build-tools/#{build_tools_version}/aapt" + binary "#{staged_path}/build-tools/#{build_tools_version}/aapt2" + binary "#{staged_path}/build-tools/#{build_tools_version}/aidl" + binary "#{staged_path}/build-tools/#{build_tools_version}/apksigner" + binary "#{staged_path}/build-tools/#{build_tools_version}/dexdump" + binary "#{staged_path}/build-tools/#{build_tools_version}/dx" + binary "#{staged_path}/build-tools/#{build_tools_version}/llvm-rs-cc" + binary "#{staged_path}/build-tools/#{build_tools_version}/zipalign" + binary "#{staged_path}/emulator/emulator" + binary "#{staged_path}/emulator/emulator-check" + binary "#{staged_path}/emulator/emulator64-arm" + binary "#{staged_path}/emulator/emulator64-mips" + binary "#{staged_path}/emulator/emulator64-x86" + binary "#{staged_path}/platform-tools/adb" + binary "#{staged_path}/platform-tools/dmtracedump" + binary "#{staged_path}/platform-tools/etc1tool" + binary "#{staged_path}/platform-tools/fastboot" + binary "#{staged_path}/platform-tools/hprof-conv" + binary "#{staged_path}/platform-tools/sqlite3" binary "#{staged_path}/tools/android" - binary "#{staged_path}/tools/ddms" - binary "#{staged_path}/tools/draw9patch" - binary "#{staged_path}/tools/emulator" - binary "#{staged_path}/tools/emulator64-arm" - binary "#{staged_path}/tools/emulator-check" - binary "#{staged_path}/tools/emulator64-mips" - binary "#{staged_path}/tools/emulator64-x86" - binary "#{staged_path}/tools/hierarchyviewer" - binary "#{staged_path}/tools/lint" + binary "#{staged_path}/tools/bin/avdmanager" + binary "#{staged_path}/tools/bin/lint" + binary "#{staged_path}/tools/bin/monkeyrunner" + binary "#{staged_path}/tools/bin/sdkmanager" binary "#{staged_path}/tools/mksdcard" binary "#{staged_path}/tools/monitor" - binary "#{staged_path}/tools/monkeyrunner" - binary "#{staged_path}/tools/traceview" - postflight do - system_command "#{staged_path}/tools/bin/sdkmanager", args: ['tools', 'platform-tools', 'build-tools;25.0.2'], input: 'y' + preflight do + system_command "#{staged_path}/tools/bin/sdkmanager", args: ['tools', 'platform-tools', "build-tools;#{build_tools_version}"], input: 'y' end caveats <<-EOS.undent