commit 35970ec0c861f7b5ee7cca2789b7dc5954cb6bb4
author Greg Daniel <egdaniel@google.com> Fri Nov 10 10:03:05 2017 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Nov 10 15:04:08 2017 +0000
tree c8d21f77270b3420bb2f9af0754978b0fc435f40
parent 0658f765d0242434cd00ceef473529a6a634dba2

Revert "Revert "Dynamically load the vulkan library in our test tools""

This reverts commit c8dd283c9a784d1e115019f5b4a1b0e082513203.

Reason for revert: <INSERT REASONING HERE>

Original change's description:
> Revert "Dynamically load the vulkan library in our test tools"
> 
> This reverts commit 77d6feaa69d95c42f4e77195e92de33917995544.
> 
> Reason for revert: breaking google 3
> 
> Original change's description:
> > Dynamically load the vulkan library in our test tools
> > 
> > Bug: skia:
> > Change-Id: I7c1f6cbb2b50ca284f40cf4b9ef49a76083b38c6
> > Reviewed-on: https://skia-review.googlesource.com/68643
> > Reviewed-by: Chris Dalton <csmartdalton@google.com>
> > Commit-Queue: Greg Daniel <egdaniel@google.com>
> 
> TBR=egdaniel@google.com,csmartdalton@google.com
> 
> Change-Id: I6b2588e71f1876868fcf8f2b3c91a96e7c689045
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: skia:
> Reviewed-on: https://skia-review.googlesource.com/69780
> Reviewed-by: Greg Daniel <egdaniel@google.com>
> Commit-Queue: Greg Daniel <egdaniel@google.com>

TBR=egdaniel@google.com,csmartdalton@google.com

Change-Id: I758aec07114305f0add086eecb1deb94d0140dcf
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/69900
Commit-Queue: Greg Daniel <egdaniel@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index e0c45fe..742f095 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -170,18 +170,6 @@
   }
   libs = []
   lib_dirs = []
-  if (skia_use_vulkan) {
-    if (skia_vulkan_sdk != "" && !is_android && !is_fuchsia) {
-      if (is_win) {
-        lib_dirs += [
-          "$skia_vulkan_sdk/Bin",
-          "$skia_vulkan_sdk/Lib",
-        ]
-      } else {
-        lib_dirs += [ "$skia_vulkan_sdk/lib/" ]
-      }
-    }
-  }
   if (skia_enable_gpu) {
     include_dirs += [ "src/gpu" ]
   }
@@ -1046,11 +1034,7 @@
       }
       if (skia_use_vulkan) {
         sources += [ "tools/gpu/vk/VkTestContext.cpp" ]
-        if (is_win) {
-          libs += [ "vulkan-1.lib" ]
-        } else {
-          libs += [ "vulkan" ]
-        }
+        sources += [ "tools/gpu/vk/VkTestUtils.cpp" ]
       }
       if (skia_use_metal) {
         sources += [ "tools/gpu/mtl/MtlTestContext.mm" ]