From 8ac1dccc141f3edcd3dcc9627f3b8f2766b5069e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Minh=20Nguy=E1=BB=85n?= <mxn@1ec5.org>
Date: Wed, 18 Feb 2015 10:23:52 -0800
Subject: [PATCH] Rewrote OS X Android build instructions for Cask

Less switching between Terminal and $BROWSER.
---
 README.md | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 0a19e7ecb..865552de4 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ implemented in C++11, currently targeting iOS, OS X, Android, and Ubuntu Linux.
  - [`libcurl`](http://curl.haxx.se/libcurl/) (depends on OpenSSL; Linux only)
  - Apple Command Line Tools (for build on OS X; available at [Apple Developer](https://developer.apple.com/downloads))
  - `pkg-config` (for build only)
- - [Homebrew](http://brew.sh) (for build on OS X)
+ - [Homebrew](http://brew.sh) and [Cask](http://caskroom.io/) (for building on OS X)
  - Python 2.x (for build only)
 
 # Build instructions
@@ -131,19 +131,29 @@ You can then open `android/java` in Android Studio via "Import Non-Android Studi
 
 ### On OS X
 
-Install Oracle JDK 7 (requires license agreement) from http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html
+Install Oracle JDK 7+:
 
-Install the [Android NDK Revision 10d](https://developer.android.com/tools/sdk/ndk/index.html) for 64-bit OS X.
+    brew cask install jdk
 
-    export ANDROID_NDK_PATH="/dir/to/android-ndk-r10d"
+Install the [Android NDK Revision 10d](https://developer.android.com/tools/sdk/ndk/index.html) for 64-bit OS X:
 
-Install the Android SDK. We recommend doing this by way of [Android Studio](https://developer.android.com/sdk/installing/studio.html). To install it, open Android Studio. By default, the SDK will be installed to `~/Library/Android/sdk`. In case you get an error message telling you that it can't find a JVM, it's because you installed a custom Java VM from Oracle. Follow [these instructions](http://tools.android.com/recent/androidstudio1rc3_releasecandidate3released) to start Android Studio. Make sure all environment variables are absolute; don't use `~` to indicate the home directory.
+    brew install android-ndk
 
-    export ANDROID_HOME="/Users/username/Library/Android/sdk"
+Install [Android Studio](https://developer.android.com/sdk/installing/studio.html) and the Android SDK:
+
+    brew cask install android-studio
+    android
+
+Install the Android SDK by opening Android Studio. By default, the SDK will be installed to `/usr/local/opt/android-sdk`. In case you get an error message telling you that it can't find a JVM, it's because you installed a custom Java VM from Oracle. Follow [these instructions](http://tools.android.com/recent/androidstudio1rc3_releasecandidate3released) to start Android Studio. You'll wind up setting these environment variables in your .bash_profile or similar:
+
+    export ANDROID_HOME=/usr/local/opt/android-sdk
+    export ANDROID_NDK_PATH=/usr/local/Cellar/android-ndk/r10d
+    export STUDIO_JDK=/Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk
 
 Run:
 
     make android
+    open -a Android\ Studio
 
 You can then open `android/java` in Android Studio via "Import Non-Android Studio Project".