Move Vulkan layer json files.

Put the Vulkan layer JSON files in the same place as the gn build puts them, for consistency. Change-Id: I6294372ce34ed20da357a8b8ea83018c4e748c37 Reviewed-on: https://chromium-review.googlesource.com/475074Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Frank Henigman <fjhenigman@chromium.org>

Move Vulkan layer json files.
f5841774 · Frank Henigman · Commit Bot · d75dd26c · f5841774
Commit f5841774 authored Apr 19, 2017 by Frank Henigman Committed by Commit Bot Apr 24, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 8 deletions

vulkan.gypi src/vulkan_support/vulkan.gypi +9 -8

No files found.
--- a/src/vulkan_support/vulkan.gypi
+++ b/src/vulkan_support/vulkan.gypi
@@ -9,6 +9,7 @@
        'spirv_headers_path': '../../third_party/spirv-headers/src',
        'spirv_tools_path': '../../third_party/spirv-tools-angle/src',
        'vulkan_layers_path': '../../third_party/vulkan-validation-layers/src',
+        'vulkan_json': 'angledata',
        'vulkan_loader_sources':
        [
            '<(vulkan_layers_path)/loader/cJSON.c',
@@ -296,12 +297,12 @@
        ],
        'vulkan_gen_json_files_outputs':
        [
-            '<(angle_gen_path)/vulkan/json/VkLayer_core_validation.json',
+            '<(PRODUCT_DIR)/<(vulkan_json)/VkLayer_core_validation.json',
-            '<(angle_gen_path)/vulkan/json/VkLayer_object_tracker.json',
+            '<(PRODUCT_DIR)/<(vulkan_json)/VkLayer_object_tracker.json',
-            '<(angle_gen_path)/vulkan/json/VkLayer_parameter_validation.json',
+            '<(PRODUCT_DIR)/<(vulkan_json)/VkLayer_parameter_validation.json',
-            '<(angle_gen_path)/vulkan/json/VkLayer_swapchain.json',
+            '<(PRODUCT_DIR)/<(vulkan_json)/VkLayer_swapchain.json',
-            '<(angle_gen_path)/vulkan/json/VkLayer_threading.json',
+            '<(PRODUCT_DIR)/<(vulkan_json)/VkLayer_threading.json',
-            '<(angle_gen_path)/vulkan/json/VkLayer_unique_objects.json',
+            '<(PRODUCT_DIR)/<(vulkan_json)/VkLayer_unique_objects.json',
        ],
    },
    'conditions':
@@ -817,7 +818,7 @@
                                    'action':
                                    [
                                        'python', '<(angle_path)/scripts/generate_vulkan_layers_json.py',
-                                        '<(vulkan_layers_path)/layers/windows', '<(angle_gen_path)/vulkan/json',
+                                        '<(vulkan_layers_path)/layers/windows', '<(PRODUCT_DIR)/<(vulkan_json)',
                                    ],
                                }],
                            ],
@@ -926,7 +927,7 @@
                            'action':
                            [
                                # TODO(jmadill): Use correct platform path
-                                'python', '<(angle_path)/scripts/generate_vulkan_header.py', '<(angle_gen_path)/vulkan/json',
+                                'python', '<(angle_path)/scripts/generate_vulkan_header.py', '<(PRODUCT_DIR)/<(vulkan_json)',
                                '<(angle_gen_path)/vulkan/angle_loader.h', '<(PRODUCT_DIR)',
                            ],
                        },