aboutsummaryrefslogtreecommitdiffhomepage
path: root/site
diff options
context:
space:
mode:
authorGravatar stani <stani@google.com>2016-06-21 13:13:19 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-06-21 13:13:20 -0700
commita80bb676d3432c202c633f9e6fb05d2348d7aa04 (patch)
tree16979e5915e5af0ec8b25dcf071b91fa11d1bf9c /site
parent7e5e594ea6fe0179b35e9d6ecb9d40cf0313f564 (diff)
Remove check for cmake in android make script.
Update docs explaining how to setup Android SDK. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2084763003 DOCS_PREVIEW= https://skia.org/?cl=2084763003 Review-Url: https://codereview.chromium.org/2084763003
Diffstat (limited to 'site')
-rw-r--r--site/user/quick/android.md21
1 files changed, 11 insertions, 10 deletions
diff --git a/site/user/quick/android.md b/site/user/quick/android.md
index 01c568fba5..53e7139215 100644
--- a/site/user/quick/android.md
+++ b/site/user/quick/android.md
@@ -34,18 +34,19 @@ where you installed the SDK and run the following commands
# You may want to add this export to your shell's .bash_profile or .profile
export ANDROID_SDK_ROOT=/path/to/android/sdk
- $ ANDROID_SDK_ROOT/tools/android update sdk --no-ui --filter android-19
+ $ANDROID_SDK_ROOT/tools/android update sdk --no-ui --filter android-19
+ $ANDROID_SDK_ROOT/tools/android update sdk --no-ui --filter android-23
+ $ANDROID_SDK_ROOT/tools/android update sdk -a -u -t 8
From here you will need to type 'y' to approve the license agreement and that
-is all. You will then have downloaded the SDK for API level 19 (Android 4.4
-KitKat) which will be used to build the Skia SampleApp. You can download as
-many other Android add-ons or APIs as you want, but you only are required to
-have this one in order to complete the Skia build process.
-
-Also, please make sure that Android SDK Build-tools 22.0.1 is installed. You can
-do that using Android SDK Manager `$ANDROID_SDK_ROOT/tools/android`. In Android
-Studio, it can be opened by clicking the Launch Standalone SDK Manager link in
-Tools > Android > SDK Manger.
+is all. You will then have downloaded the SDK for API level 19 and 23(Android 4.4
+KitKat and Android 6.0 Marshmallow) which will be used to build the Skia SampleApp.
+You can download as many other Android add-ons or APIs as you want, but you only
+are required to have these two in order to complete the Skia build process.
+
+The last line in the script installs Android SDK Build-tools 22.0.1.
+Alternatively you can download the above packages with Android Studio, by clicking
+the Launch Standalone SDK Manager link in Tools > Android > SDK Manger.
Setup Environment for Android
-----------------------------