aboutsummaryrefslogtreecommitdiffhomepage
path: root/site
diff options
context:
space:
mode:
authorGravatar Hal Canary <halcanary@google.com>2018-02-09 10:38:25 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-02-09 16:22:42 +0000
commit9657b2f1321313beb4ffc0120ec2bd220f00215a (patch)
treeb1e38c58b767df9cfada2c89a59fba8e97a9ae77 /site
parente7b8fea74a337808485fc0a1861a8f37410accce (diff)
Documentation Fixes: Viewer on Android needs SDK
No-Try: true Docs-Preview: https://skia.org/user/sample/viewer?cl=106122 Change-Id: I64a7885a274bdd0b0c34532138569826163e7cb8 Reviewed-on: https://skia-review.googlesource.com/106122 Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Florin Malita <fmalita@chromium.org>
Diffstat (limited to 'site')
-rw-r--r--site/user/sample/viewer.md32
1 files changed, 25 insertions, 7 deletions
diff --git a/site/user/sample/viewer.md b/site/user/sample/viewer.md
index f30888dd16..0ff9a596f2 100644
--- a/site/user/sample/viewer.md
+++ b/site/user/sample/viewer.md
@@ -36,17 +36,35 @@ Space | Toggle display of Tools UI
Android
-------
-The Viewer APK must be built by gradle which can be invoked on the command line with the following script:
- ./platform_tools/android/bin/android_build_app -C <out_dir> viewer
+To build Viewer as an Android App, you will need the
+[Android SDK](https://developer.android.com/studio/#command-tools) installed and your `ANDROID_HOME` environment variable set.
-where `<out_dir>` is the ninja out directory for android (e.g., `out/arm64`) that you want to use to
-build the app. Upon completion of the script the APK can be found at `<out_dir>/viewer.apk`
+ mkdir ~/android-sdk
+ ( cd ~/android-sdk; unzip ~/Downloads/sdk-tools-*.zip )
+ yes | ~/android-sdk/tools/bin/sdkmanager --licenses
+ export ANDROID_HOME=~/android-sdk # Or wherever you installed the Android SDK.
-To load resources in the Android Viewer place them in `/data/local/tmp/resources`; to load SKPs place them in `/data/local/tmp/skps`.
+The Viewer APK must be built by gradle which can be invoked on the command line
+with the following script:
-Swiping left and right will switch slides, pinch-zoom will zoom in and out, and display options are available in the UI.
+ platform_tools/android/bin/android_build_app -C <out_dir> viewer
+
+where `<out_dir>` is the ninja out directory for android (e.g., `out/arm64`)
+that you want to use to build the app. Upon completion of the script the APK
+can be found at `<out_dir>/viewer.apk`
+
+To load resources in the Android Viewer place them in
+`/data/local/tmp/resources`; to load SKPs place them in `/data/local/tmp/skps`.
+
+Swiping left and right will switch slides, pinch-zoom will zoom in and out, and
+display options are available in the UI.
iOS
---
-The viewer is not yet fully supported on iOS, but can be used to display individual slides on a device by launching via `ios-deploy` with the `--match` or `--slide` command-line options. The viewer will automatically bundle the `resources` directory in the top-level Skia directory, and will bundle an `skps` directory if also placed in the Skia directory.
+
+The viewer is not yet fully supported on iOS, but can be used to display
+individual slides on a device by launching via `ios-deploy` with the `--match`
+or `--slide` command-line options. The viewer will automatically bundle the
+`resources` directory in the top-level Skia directory, and will bundle an
+`skps` directory if also placed in the Skia directory.