VulkanViewer on Android

platform_tools/android/bin/android_setup.sh

Index: platform_tools/android/bin/android_setup.sh
diff --git a/platform_tools/android/bin/android_setup.sh b/platform_tools/android/bin/android_setup.sh
index fd05a985e31a996e6312a49836835aa56a24bbfb..0084fc6bb7b78c59903df013b262969275e45ff0 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"