android-sdk: fix tool installs
aapt aidl dexdump dx llvm-rs-cc was moved to build-tools in r22. Closes Homebrew/homebrew#20325. Signed-off-by: Adam Vandenberg <flangy@gmail.com>
This commit is contained in:
parent
a47193d693
commit
eead602181
1 changed files with 10 additions and 1 deletions
|
@ -43,7 +43,7 @@ class AndroidSdk < Formula
|
|||
dst.make_relative_symlink src
|
||||
end
|
||||
|
||||
%w[aapt adb aidl dexdump dx fastboot llvm-rs-cc].each do |platform_tool|
|
||||
%w[adb fastboot].each do |platform_tool|
|
||||
(bin/platform_tool).write <<-EOS.undent
|
||||
#!/bin/sh
|
||||
PLATFORM_TOOL="#{prefix}/platform-tools/#{platform_tool}"
|
||||
|
@ -52,6 +52,15 @@ class AndroidSdk < Formula
|
|||
EOS
|
||||
end
|
||||
|
||||
%w[aapt aidl dexdump dx llvm-rs-cc].each do |build_tool|
|
||||
(bin/build_tool).write <<-EOS.undent
|
||||
#!/bin/sh
|
||||
BUILD_TOOL="#{prefix}/build-tools/17.0.0/#{build_tool}"
|
||||
test -f "$BUILD_TOOL" && exec "$BUILD_TOOL" "$@"
|
||||
echo Use the \\`android\\' tool to install the \\"Android SDK Build-tools\\".
|
||||
EOS
|
||||
end
|
||||
|
||||
AdbBashCompletion.new.brew do
|
||||
bash_completion.install 'adb.bash' => 'adb-completion.bash'
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue