From 236e272380dcb30ad3ea009efe1be7f734dd6d8c Mon Sep 17 00:00:00 2001 From: liyuqian Date: Mon, 22 Aug 2016 13:36:57 -0700 Subject: 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 | 4 ++++ platform_tools/android/apps/viewer/build.gradle | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/platform_tools/android/apps/build.gradle b/platform_tools/android/apps/build.gradle index 901e3295ea..c16bfe433a 100644 --- a/platform_tools/android/apps/build.gradle +++ b/platform_tools/android/apps/build.gradle @@ -111,5 +111,9 @@ def constructBuildCommand(variant, buildTarget) { if (variant.name.endsWith("Release")) { cmdLine += " --release" } + + if (variant.name.indexOf("vulkan") != -1) { + cmdLine += " --vulkan" + } return cmdLine } \ No newline at end of file diff --git a/platform_tools/android/apps/viewer/build.gradle b/platform_tools/android/apps/viewer/build.gradle index 15cff2cb39..6da64be3b5 100644 --- a/platform_tools/android/apps/viewer/build.gradle +++ b/platform_tools/android/apps/viewer/build.gradle @@ -24,7 +24,7 @@ android { } 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) } -- cgit v1.2.3