android-ndk r10c

Closes #33411.

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

1 files changed, 14 insertions, 19 deletions

diff --git a/Library/Formula/android-ndk.rb b/Library/Formula/android-ndk.rb
index 440cb576a..1191921ed 100644
--- a/Library/Formula/android-ndk.rb
+++ b/Library/Formula/android-ndk.rb
@@ -4,35 +4,30 @@ class AndroidNdk < Formula
   homepage "http://developer.android.com/sdk/ndk/index.html"
 
   if MacOS.prefer_64_bit?
-    url "https://dl.google.com/android/ndk/android-ndk32-r10b-darwin-x86_64.tar.bz2"
-    sha1 "6888a670c9d9007ffba7e314e38c367b6ea67f7c"
-
-    resource "64bit_target" do
-      url "https://dl.google.com/android/ndk/android-ndk64-r10b-darwin-x86_64.tar.bz2"
-      sha1 "b8354a4547cedb2901acc3dc35fd29104f6cc1bf"
-    end
+    url "http://dl.google.com/android/ndk/android-ndk-r10c-darwin-x86_64.bin"
+    sha1 "a136ca2ad87771422c2cfa9474196cd29ffd9bb1"
   else
-    url "https://dl.google.com/android/ndk/android-ndk32-r10b-darwin-x86.tar.bz2"
-    sha1 "ee763b15cded16d313feded1e7244ce094825574"
-
-    resource "64bit_target" do
-      url "https://dl.google.com/android/ndk/android-ndk64-r10b-darwin-x86.tar.bz2"
-      sha1 "e55fecfa0189a0f94725d3208a4a1c1d4235a3ab"
-    end
+    url "http://dl.google.com/android/ndk/android-ndk-r10c-darwin-x86.bin"
+    sha1 "b083f9a1a4dd66d55ced8ea41eea6a0a91ea1ac9"
   end
 
+  version "r10c"
+
   depends_on "android-sdk" => :recommended
 
   def install
     bin.mkpath
 
-    # Unpack 64-bit target into current directory
-    target = resource("64bit_target")
-    target.verify_download_integrity(target.fetch)
-    system "tar", "xf", target.cached_download, "-C", buildpath.dirname
+    if MacOS.prefer_64_bit?
+      system "chmod", "a+x", "./android-ndk-r10c-darwin-x86_64.bin"
+      system "./android-ndk-r10c-darwin-x86_64.bin"
+    else
+      system "chmod", "a+x", "./android-ndk-r10c-darwin-x86.bin"
+      system "./android-ndk-r10c-darwin-x86.bin"
+    end
 
     # Now we can install both 64-bit and 32-bit targeting toolchains
-    prefix.install Dir["*"]
+    prefix.install Dir["android-ndk-r10c/*"]
 
     # Create a dummy script to launch the ndk apps
     ndk_exec = prefix+"ndk-exec.sh"