summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorBrad Leege <bleege@gmail.com>2015-11-09 16:11:50 -0600
committerBrad Leege <bleege@gmail.com>2015-11-09 16:11:50 -0600
commit83ea5be413d7d2f605062d6e392e7e9b2ddb83fe (patch)
tree70a2bfae9f9b29e56dfff44f3eec26a4f2722595 /docs
parent2abdcb0a81b426588ec2c21b9ea7dcabaab04b2f (diff)
downloadqtlocation-mapboxgl-83ea5be413d7d2f605062d6e392e7e9b2ddb83fe.tar.gz
[android] #2369 - Updating Android setup instructions for OS X
Diffstat (limited to 'docs')
-rw-r--r--docs/DEVELOP_ANDROID_OSX.md16
1 files changed, 9 insertions, 7 deletions
diff --git a/docs/DEVELOP_ANDROID_OSX.md b/docs/DEVELOP_ANDROID_OSX.md
index 1a55a1e396..f4f933646d 100644
--- a/docs/DEVELOP_ANDROID_OSX.md
+++ b/docs/DEVELOP_ANDROID_OSX.md
@@ -1,17 +1,19 @@
# Developing for Android on OS X
-Install Oracle JDK 7+, the Android SDK, and Android Studio:
+Install Oracle JDK 7+ and Android Studio:
+ brew tap caskroom/cask
+ brew install brew-cask
brew cask install java
- brew install android-sdk
+
brew cask install android-studio
- android
-In the Android SDK Manager also select and install "Android Support Repository" and "Android Support Library" from "Extras":
+
+Once Android Studio is downloaded and installed, the [first time it's run it'll ask to install the Android SDK](http://developer.android.com/sdk/installing/index.html?pkg=studio) which you should do. While doing so in the Android SDK Manager make sure to also select and install "Android Support Repository" and "Android Support Library" from "Extras":
![image](https://cloud.githubusercontent.com/assets/98601/9915837/289f398e-5c6e-11e5-9a84-ed4d08d52d1f.png)
-By default, the SDK will be installed to `/usr/local/opt/android-sdk`. If you open Android Studio at this point, you may 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:
+By default, the Android SDK will be installed to `/Users/<user>/Library/Android/sdk/`. If you open Android Studio at this point, you may 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:
echo "export ANDROID_HOME=`brew --prefix android-sdk`" >> .bash_profile
echo "export ANDROID_NDK_PATH=`brew --cellar android-ndk`/r10e" >> .bash_profile
@@ -23,13 +25,13 @@ By default, the SDK will be installed to `/usr/local/opt/android-sdk`. If you op
_The demo applications use Mapbox vector tiles, which require a Mapbox account and API access token. Obtain an access token on the [Mapbox account page](https://www.mapbox.com/account/apps/)._
-gradle will take the value of the `MAPBOX_ACCESS_TOKEN` environ variable and save it to `android/java/MapboxGLAndroidSDKTestApp/src/main/res/raw/token.txt` where the app will read it from.
+gradle will take the value of the `MAPBOX_ACCESS_TOKEN` environ variable and save it to `android/MapboxGLAndroidSDKTestApp/src/main/res/raw/token.txt` where the app will read it from.
Run:
make android
open -a Android\ Studio
-You can then open `android/java` in Android Studio via "Import project (Eclipse ADT, Gradle, etc.)".
+You can then open `android` in Android Studio via "Import project (Eclipse ADT, Gradle, etc.)".
**Next: get your app [running on a hardware Android Device](docs/ANDROID_DEVICE.md) or [simulator](docs/ANDROID_SIMULATOR.md)**