diff options
| -rwxr-xr-x | platform_tools/android/bin/android_setup.sh | 7 | ||||
| -rw-r--r-- | site/user/quick/android.md | 21 |
2 files changed, 11 insertions, 17 deletions
diff --git a/platform_tools/android/bin/android_setup.sh b/platform_tools/android/bin/android_setup.sh index 0a6fd5f0ab..d092922416 100755 --- a/platform_tools/android/bin/android_setup.sh +++ b/platform_tools/android/bin/android_setup.sh @@ -87,13 +87,6 @@ fi if [ "$SKIA_VULKAN" == "true" ]; then export GYP_DEFINES="skia_vulkan=1 $GYP_DEFINES" - # add cmake from the SDK to your path if it doesn't exist - if [ ! -d "${ANDROID_SDK_ROOT}/cmake" ]; then - echo "The Android SDK Tools version of CMake is required to build Vulkan. ${ANDROID_SDK_ROOT}/cmake" - exit 1 - else - export PATH=${ANDROID_SDK_ROOT}/cmake/bin:$PATH - fi fi # Helper function to configure the GYP defines to the appropriate values 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 ----------------------------- |