android-sdk: fix tool installs

aapt aidl dexdump dx llvm-rs-cc was moved to build-tools in r22.

Closes #20325.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>

1 files changed, 10 insertions, 1 deletions

diff --git a/Library/Formula/android-sdk.rb b/Library/Formula/android-sdk.rb
index 4f6adc015..b6e976c47 100644
--- a/Library/Formula/android-sdk.rb
+++ b/Library/Formula/android-sdk.rb
@@ -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