diff options
author | 2018-02-13 16:06:04 -0500 | |
---|---|---|
committer | 2018-02-14 15:26:47 +0000 | |
commit | afe6cae2bac73b51f051f87c56b44cc4e164e688 (patch) | |
tree | 7ecacefde83352b250769efe96a00799f772848f /infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-ANGLE.json | |
parent | 0ee866dac78b60497b4c107995d3c2747309ef8b (diff) |
Do not copy vulkan-1.dll to Win bots.
Previously, we needed vulkan-1.dll from the Vulkan runtime because some
drivers did not include the Vulkan loader. Now, all drivers include this
DLL and using the version from assets causes problems for newer Intel
drivers.
Bug: skia:7490
Change-Id: I7bd37fb0d2c88a4753f354ab2bc88761562ced2f
Reviewed-on: https://skia-review.googlesource.com/107060
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
Diffstat (limited to 'infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-ANGLE.json')
-rw-r--r-- | infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-ANGLE.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-ANGLE.json b/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-ANGLE.json index 0c8466f0b3..55e1252d35 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-ANGLE.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-ANGLE.json @@ -146,7 +146,7 @@ "cmd": [ "python", "-u", - "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'vulkan-1.dll']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", + "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86_64-Release-ANGLE/Release", "[CUSTOM_[SWARM_OUT_DIR]]/out/Release" ], @@ -161,7 +161,7 @@ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@src = sys.argv[1]@@@", "@@@STEP_LOG_LINE@python.inline@dst = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@build_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'vulkan-1.dll']@@@", + "@@@STEP_LOG_LINE@python.inline@build_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so']@@@", "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", "@@@STEP_LOG_LINE@python.inline@ os.makedirs(dst)@@@", |