diff options
| author |  djsollen <djsollen@google.com> | 2016-04-21 07:59:44 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-04-21 07:59:44 -0700 |
| commit | 12d62a7d51a1826e221ffd34224d01c9bec49bab (patch) | |
| tree | e3906a4d96e03158ea6e20e66bfe8d09df4fb84e /platform_tools/android/bin | |
| parent | d37fe76b5101dfe6c29668f5c29e5b46e697a68d (diff) | |
VulkanViewer on Android
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1903253003
Review URL: https://codereview.chromium.org/1903253003
Diffstat (limited to 'platform_tools/android/bin')
| -rwxr-xr-x | platform_tools/android/bin/android_setup.sh | 8 | ||||
| -rwxr-xr-x | platform_tools/android/bin/utils/setup_toolchain.sh | 4 |
2 files changed, 11 insertions, 1 deletions
diff --git a/platform_tools/android/bin/android_setup.sh b/platform_tools/android/bin/android_setup.sh index fd05a985e3..0084fc6bb7 100755 --- a/platform_tools/android/bin/android_setup.sh +++ b/platform_tools/android/bin/android_setup.sh @@ -38,6 +38,8 @@ while (( "$#" )); do LOGCAT=1 elif [[ "$1" == "--verbose" ]]; then VERBOSE="true" + elif [[ "$1" == "--vulkan" ]]; then + SKIA_VULKAN="true" else APP_ARGS=("${APP_ARGS[@]}" "${1}") fi @@ -48,6 +50,10 @@ if [ "$USE_CLANG" == "true" ]; then export GYP_DEFINES="skia_clang_build=1 $GYP_DEFINES" fi +if [ "$SKIA_VULKAN" == "true" ]; then + export GYP_DEFINES="skia_vulkan=1 $GYP_DEFINES" +fi + function verbose { if [[ -n $VERBOSE ]]; then echo $@ @@ -167,7 +173,7 @@ setup_device() { source $SCRIPT_DIR/utils/setup_toolchain.sh fi - DEFINES="${DEFINES} android_toolchain=${TOOLCHAIN_TYPE}" + DEFINES="${DEFINES} android_toolchain=${ANDROID_TOOLCHAIN}" DEFINES="${DEFINES} android_buildtype=${BUILDTYPE}" exportVar GYP_DEFINES "$DEFINES $GYP_DEFINES" diff --git a/platform_tools/android/bin/utils/setup_toolchain.sh b/platform_tools/android/bin/utils/setup_toolchain.sh index 50098ba34a..6851931bfb 100755 --- a/platform_tools/android/bin/utils/setup_toolchain.sh +++ b/platform_tools/android/bin/utils/setup_toolchain.sh @@ -42,6 +42,10 @@ function default_toolchain() { else API=14 # Android 4.0 fi + + if [ "$SKIA_VULKAN" == "true" ]; then + API=24 # Android N Preview + fi TOOLCHAIN=$ANDROID_ARCH-$NDK-$API HOST=`uname | tr '[A-Z]' '[a-z]'` |