From ba6e3848dfd171722726ff91142ea5acc6d51c73 Mon Sep 17 00:00:00 2001 From: Leith Bade Date: Tue, 10 Feb 2015 11:21:00 -0800 Subject: [PATCH] Add target devices to Android README --- README.md | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 002a530ca..0a19e7ecb 100644 --- a/README.md +++ b/README.md @@ -45,9 +45,9 @@ Target OS X: 10.9+ ## iOS -If you merely want to install the library for iOS and try it out as an Objective-C consumer, run `./scripts/package_ios.sh`. It requires the Boost headers to be installed, so use [Homebrew](http://brew.sh/) to install them (`brew install boost`). The packaging script will produce the statically-linked `libMapboxGL.a`, `MapboxGL.bundle` for resources, and a `Headers` folder. +If you merely want to install the library for iOS and try it out as an Objective-C consumer, run `./scripts/package_ios.sh`. It requires the Boost headers to be installed, so use [Homebrew](http://brew.sh/) to install them (`brew install boost`). The packaging script will produce the statically-linked `libMapboxGL.a`, `MapboxGL.bundle` for resources, and a `Headers` folder. -If you want to build from source and/or contribute to development of the project, run `make iproj`, which will create and open an Xcode project which can build the entire library from source as well as an Objective-C test app. +If you want to build from source and/or contribute to development of the project, run `make iproj`, which will create and open an Xcode project which can build the entire library from source as well as an Objective-C test app. Target devices: iPhone 4S and above (5, 5c, 5s, 6, 6 Plus) and iPad 2 and above (3, 4, Mini, Air, Mini 2, Air 2). @@ -100,7 +100,11 @@ Set an access token as described below, and then run: make run-linux -## Android (on Linux) +## Android + +Target devices: All Android devices on Android 4.0 or newer (API level >= 14) + +### On Linux Install a few build dependencies: @@ -125,7 +129,7 @@ Run: You can then open `android/java` in Android Studio via "Import Non-Android Studio Project". -## Android (on OS X) +### On OS X Install Oracle JDK 7 (requires license agreement) from http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html