android-ndk r10b

Closes #32258.

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

1 files changed, 14 insertions, 15 deletions

diff --git a/Library/Formula/android-ndk.rb b/Library/Formula/android-ndk.rb
index 7629e7c8e..027f20c03 100644
--- a/Library/Formula/android-ndk.rb
+++ b/Library/Formula/android-ndk.rb
@@ -2,23 +2,22 @@ require 'formula'
 
 class AndroidNdk < Formula
   homepage 'http://developer.android.com/sdk/ndk/index.html'
-  version 'r10'
 
   if MacOS.prefer_64_bit?
-    url "https://dl.google.com/android/ndk/android-ndk64-r10-darwin-x86_64.tar.bz2"
-    sha1 '9ecda655e448d3b249be17f1d66f7e4f9535a3b8'
+    url "https://dl.google.com/android/ndk/android-ndk32-r10b-darwin-x86_64.tar.bz2"
+    sha1 '6888a670c9d9007ffba7e314e38c367b6ea67f7c'
 
-    resource "32bit_target" do
-      url "https://dl.google.com/android/ndk/android-ndk32-r10-darwin-x86_64.tar.bz2"
-      sha1 '4a1d226ee7361b51c02e723b5758e3da536cdf8b'
+    resource "64bit_target" do
+      url "https://dl.google.com/android/ndk/android-ndk64-r10b-darwin-x86_64.tar.bz2"
+      sha1 'b8354a4547cedb2901acc3dc35fd29104f6cc1bf'
     end
   else
-    url "https://dl.google.com/android/ndk/android-ndk64-r10-darwin-x86.tar.bz2"
-    sha1 '0fbfd9b3af17cdab56ac475e1998f53c31fb9c1d'
+    url "https://dl.google.com/android/ndk/android-ndk32-r10b-darwin-x86.tar.bz2"
+    sha1 'ee763b15cded16d313feded1e7244ce094825574'
 
-    resource "32bit_target" do
-      url "https://dl.google.com/android/ndk/android-ndk32-r10-darwin-x86.tar.bz2"
-      sha1 'd38f5fce29e07d8b4deb538ebc2ba1ba4c067afd'
+    resource "64bit_target" do
+      url "https://dl.google.com/android/ndk/android-ndk64-r10b-darwin-x86.tar.bz2"
+      sha1 'e55fecfa0189a0f94725d3208a4a1c1d4235a3ab'
     end
   end
 
@@ -27,12 +26,12 @@ class AndroidNdk < Formula
   def install
     bin.mkpath
 
-    # Unpack 32-bit target into current directory
-    target = resource("32bit_target")
+    # Unpack 64-bit target into current directory
+    target = resource("64bit_target")
     target.verify_download_integrity(target.fetch)
-    system "tar", "xf", target.cached_download
+    system "tar", "xf", target.cached_download, "-C", buildpath.dirname
 
-    # Now we can install both 64-bit and 32-bit targeting toolchains
+    # Now we can install both 32-bit and 64-bit targeting toolchains
     prefix.install Dir['*']
 
     # Create a dummy script to launch the ndk apps