diff options
| author |  Ben Wagner <benjaminwagner@google.com> | 2018-02-14 11:28:11 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-02-14 17:40:37 +0000 |
| commit | 463001b5ac9f3ee91861a6c6181035f55b70dd20 (patch) | |
| tree | 6e9611c9bbed8f56b592628257a7032b030b6b15 /infra | |
| parent | 84403d7f53d88b2449fd19415538ba1479fe300b (diff) | |
Bots only need Include dir from the Win Vulkan SDK.
This is a followup to
https://skia-review.googlesource.com/c/skia/+/107060
Bug: skia:7490
Change-Id: I597b5468f4a684322e42a96ed396b80652ac0999
Reviewed-on: https://skia-review.googlesource.com/107026
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
Diffstat (limited to 'infra')
| -rw-r--r-- | infra/bots/assets/win_vulkan_sdk/VERSION | 2 | ||||
| -rw-r--r-- | infra/bots/assets/win_vulkan_sdk/create.py | 13 | ||||
| -rw-r--r-- | infra/bots/assets/win_vulkan_sdk/create_and_upload.py | 6 | ||||
| -rw-r--r-- | infra/bots/tasks.json | 2 |
4 files changed, 9 insertions, 14 deletions
diff --git a/infra/bots/assets/win_vulkan_sdk/VERSION b/infra/bots/assets/win_vulkan_sdk/VERSION index d8263ee986..7f8f011eb7 100644 --- a/infra/bots/assets/win_vulkan_sdk/VERSION +++ b/infra/bots/assets/win_vulkan_sdk/VERSION @@ -1 +1 @@ -2
\ No newline at end of file +7 diff --git a/infra/bots/assets/win_vulkan_sdk/create.py b/infra/bots/assets/win_vulkan_sdk/create.py index 993345555c..0728f6d523 100644 --- a/infra/bots/assets/win_vulkan_sdk/create.py +++ b/infra/bots/assets/win_vulkan_sdk/create.py @@ -15,12 +15,14 @@ import sys import os -def create_asset(target_dir, sdk_path, runtime_path): +def create_asset(target_dir, sdk_path): """Create the asset.""" + # The bots only need Include from the SDK. + target_include_dir = os.path.join(target_dir, "Include") + sdk_include_dir = os.path.join(sdk_path, "Include") if not os.path.isdir(target_dir): os.makedirs(target_dir) - shutil.copytree(sdk_path, target_dir) - shutil.copyfile(runtime_path, os.path.join(target_dir, "vulkan-1.dll")) + shutil.copytree(sdk_include_dir, target_include_dir) def main(): if sys.platform != 'win32': @@ -29,11 +31,8 @@ def main(): parser = argparse.ArgumentParser() parser.add_argument('--target_dir', '-t', required=True) parser.add_argument('--sdk_path', '-s', required=True) - parser.add_argument('--runtime_path', '-r', - default=os.path.join("C:","System32","vulkan-1.dll"), - required=True) args = parser.parse_args() - create_asset(args.target_dir, args.sdk_path, args.runtime_path) + create_asset(args.target_dir, args.sdk_path) if __name__ == '__main__': diff --git a/infra/bots/assets/win_vulkan_sdk/create_and_upload.py b/infra/bots/assets/win_vulkan_sdk/create_and_upload.py index 38c6943381..69dbec994f 100644 --- a/infra/bots/assets/win_vulkan_sdk/create_and_upload.py +++ b/infra/bots/assets/win_vulkan_sdk/create_and_upload.py @@ -24,9 +24,6 @@ def main(): parser = argparse.ArgumentParser() parser.add_argument('--gsutil') parser.add_argument('--sdk_path', '-s', required=True) - parser.add_argument('--runtime_path', '-r', - default=os.path.join("C:","System32","vulkan-1.dll"), - required=True) args = parser.parse_args() with utils.tmp_dir(): @@ -38,8 +35,7 @@ def main(): cwd = os.path.join(cwd, 'sdk') cmd = ['python', create_script, '-t', cwd, - '--sdk_path', args.sdk_path, - '--runtime_path', args.runtime_path] + '--sdk_path', args.sdk_path] subprocess.check_call(cmd) cmd = ['python', upload_script, '-t', cwd] if args.gsutil: diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json index a2b70eb575..249e9f387a 100644 --- a/infra/bots/tasks.json +++ b/infra/bots/tasks.json @@ -6403,7 +6403,7 @@ { "name": "skia/bots/win_vulkan_sdk", "path": "win_vulkan_sdk", - "version": "version:2" + "version": "version:7" } ], "dimensions": [ |