diff options
author | Jamie Madill <jmadill@chromium.org> | 2019-08-23 01:05:38 +0000 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2019-08-23 01:05:50 +0000 |
commit | 5f3c98de9d5a11541600a1d81f4b01fdf2f7bc6e (patch) | |
tree | b3acef3332fc3b25e116936ca945af3c1907301c /dotfile_settings.gni | |
parent | 5ec04880101485dd2b70074c902ccd68af6b3738 (diff) | |
download | angle-5f3c98de9d5a11541600a1d81f4b01fdf2f7bc6e.tar.gz |
Revert "Vulkan: Use VK repos' internal BUILD.gn files"
This reverts commit 552f5fcb0d8fcc615856ce3b678190e1cbdd38e6.
Reason for revert: Causing flakiness in "confirm no-op" CQ step.
See issue for more details.
Bug: chromium:997016
Original change's description:
> Vulkan: Use VK repos' internal BUILD.gn files
>
> This retires custom BUILD.gn files for the Vulkan Headers, Tools,
> Validation-Layers, and Loader repos. They now have integrated BUILD.gn
> files so switched ANGLE to use those by default.
> Also Validation Layer, Loader, and Tools repos no longer uses codegen
> so this speeds up the build overall.
> Switched over from old VK_LAYER_LUNARG_standard_validation meta-layer
> to VK_LAYER_KHRONOS_validation unified layer.
>
> This changes includes a temporary workaround to the Vulkan-Loader repo
> to remove its Window's build dependence on WDK. There are plans to
> remove that depenedence in Loader master, but until then we can use
> our custom branch workaround.
> It also includes a custom branch for validation layers that includes
> some build fixes for ANGLE.
> Finally, the layers were crashing on Android when attempting to use
> DebugUtils extension so forcing DebugReport on Android for now.
>
> Bug: angleproject:2449
> Bug: angleproject:3320
> Bug: angleproject:3852
> Change-Id: I48b36acefcc7f2bc930eb72d6fdbc87bca24f833
> Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1610438
> Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
> Reviewed-by: Jamie Madill <jmadill@chromium.org>
> Commit-Queue: Tobin Ehlis <tobine@google.com>
TBR=ynovikov@chromium.org,tobine@google.com,syoussefi@chromium.org,jmadill@chromium.org
Change-Id: Iec97ba8cb5c38fa56bfd4c0afb0f7af8d68513ff
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: angleproject:2449, angleproject:3320, angleproject:3852
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1767363
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Diffstat (limited to 'dotfile_settings.gni')
-rw-r--r-- | dotfile_settings.gni | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/dotfile_settings.gni b/dotfile_settings.gni index baf6e60467..8c370c36f5 100644 --- a/dotfile_settings.gni +++ b/dotfile_settings.gni @@ -8,10 +8,9 @@ angle_dotfile_settings = { exec_script_whitelist = [ get_path_info("BUILD.gn", "abspath"), - get_path_info("third_party/vulkan-headers/src/BUILD.gn", "abspath"), - get_path_info("third_party/vulkan-loader/src/BUILD.gn", "abspath"), - get_path_info("third_party/vulkan-tools/src/BUILD.gn", "abspath"), - get_path_info("third_party/vulkan-validation-layers/src/BUILD.gn", - "abspath"), + get_path_info("third_party/vulkan-headers/BUILD.gn", "abspath"), + get_path_info("third_party/vulkan-loader/BUILD.gn", "abspath"), + get_path_info("third_party/vulkan-tools/BUILD.gn", "abspath"), + get_path_info("third_party/vulkan-validation-layers/BUILD.gn", "abspath"), ] } |