android-sdk: fix binary paths for tools version 20

Closes #30543.

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>

1 files changed, 19 insertions, 3 deletions

diff --git a/Library/Formula/android-sdk.rb b/Library/Formula/android-sdk.rb
index 48548ba31..8bead7d32 100644
--- a/Library/Formula/android-sdk.rb
+++ b/Library/Formula/android-sdk.rb
@@ -22,9 +22,9 @@ class AndroidSdk < Formula
   def install
     prefix.install 'tools', 'SDK Readme.txt' => 'README'
 
-    %w[android apkbuilder ddms dmtracedump draw9patch etc1tool emulator
-    emulator-arm emulator-x86 hierarchyviewer hprof-conv lint mksdcard
-    monitor monkeyrunner traceview zipalign].each do |tool|
+    %w[android ddms draw9patch emulator
+    emulator-arm emulator-x86 hierarchyviewer lint mksdcard
+    monitor monkeyrunner traceview].each do |tool|
       (bin/tool).write <<-EOS.undent
         #!/bin/bash
         TOOL="#{prefix}/tools/#{tool}"
@@ -32,6 +32,22 @@ class AndroidSdk < Formula
       EOS
     end
 
+    %w[zipalign].each do |tool|
+      (bin/tool).write <<-EOS.undent
+        #!/bin/bash
+        TOOL="#{prefix}/build-tools/#{build_tools_version}/#{tool}"
+        exec "$TOOL" "$@"
+      EOS
+    end
+
+    %w[dmtracedump etc1tool hprof-conv].each do |tool|
+      (bin/tool).write <<-EOS.undent
+        #!/bin/bash
+        TOOL="#{prefix}/platform-tools/#{tool}"
+        exec "$TOOL" "$@"
+      EOS
+    end
+
     # this is data that should be preserved across upgrades, but the Android
     # SDK isn't too smart, so we still have to symlink it back into its tree.
     %w[platforms samples temp add-ons sources system-images extras].each do |d|