commit 236e272380dcb30ad3ea009efe1be7f734dd6d8c
author liyuqian <liyuqian@google.com> Mon Aug 22 13:36:57 2016 -0700
committer Commit bot <commit-bot@chromium.org> Mon Aug 22 13:36:57 2016 -0700
tree 6627876645849cfa02555c03527154ad9b535fe7
parent 8ae991e433d2c0814ea5579613f00173805ff057

Remove vulkan from most build variants

Since many devices don't support vulkan, we have to remove it for most
build variants and only turn it on manually by selecting arm64vulkan
build variant.

BUG=skia:5516
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2255973003

Review-Url: https://codereview.chromium.org/2255973003

platform_tools/android/apps/build.gradle

diff --git a/platform_tools/android/apps/build.gradle b/platform_tools/android/apps/build.gradle
index 901e329..c16bfe4 100644
--- a/platform_tools/android/apps/build.gradle
+++ b/platform_tools/android/apps/build.gradle
@@ -111,5 +111,9 @@
     if (variant.name.endsWith("Release")) {
         cmdLine += " --release"
     }
+
+    if (variant.name.indexOf("vulkan") != -1) {
+        cmdLine += " --vulkan"
+    }
     return cmdLine
 }
\ No newline at end of file

platform_tools/android/apps/viewer/build.gradle

diff --git a/platform_tools/android/apps/viewer/build.gradle b/platform_tools/android/apps/viewer/build.gradle
index 15cff2c..6da64be 100644
--- a/platform_tools/android/apps/viewer/build.gradle
+++ b/platform_tools/android/apps/viewer/build.gradle
@@ -24,7 +24,7 @@
     }
     sourceSets.main.jni.srcDirs = [] //disable automatic ndk-build call
     sourceSets.main.jniLibs.srcDir "src/main/libs"
-    productFlavors { arm {}; arm64 {}; x86 {}; x86_64 {}; mips {}; mips64 {}; }
+    productFlavors { arm {}; arm64 {}; x86 {}; x86_64 {}; mips {}; mips64 {}; arm64vulkan{}; }
 
-    setupSkiaLibraryBuild(project, applicationVariants, "--vulkan CopyViewerDeps", true)
+    setupSkiaLibraryBuild(project, applicationVariants, "CopyViewerDeps", true)
 }