Move vulkan-deps to //flutter/third_party/vulkan-deps (#51013)

jason-simmons · web-flow · commit ab4d6db3f119 · 2024-02-27T21:59:00.000Z
See flutter/flutter#144205
diff --git a/DEPS b/DEPS
@@ -279,7 +279,7 @@ allowed_hosts = [
 ]
 
 deps = {
-  'src': 'https://github.com/flutter/buildroot.git' + '@' + '21b1b9f2645fada701885108e86aefbcb3b1cca0',
+  'src': 'https://github.com/flutter/buildroot.git' + '@' + '2f684abc6e6bfba9062bd372929a8d458e03940a',
 
   'src/flutter/third_party/depot_tools':
   Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '580b4ff3f5cd0dcaa2eacda28cefe0f45320e8f7',
@@ -302,7 +302,7 @@ deps = {
   'src/flutter/third_party/shaderc':
    Var('chromium_git') + '/external/github.com/google/shaderc' + '@' + '37e25539ce199ecaf19fb7f7d27818716d36686d',
 
-  'src/third_party/vulkan-deps':
+  'src/flutter/third_party/vulkan-deps':
    Var('chromium_git') + '/vulkan-deps' + '@' + '014f44e134a1de387791bffacc32ff9d8db71176',
 
   'src/flutter/third_party/flatbuffers':
@@ -1063,7 +1063,7 @@ deps = {
 }
 
 recursedeps = [
-  'src/third_party/vulkan-deps',
+  'src/flutter/third_party/vulkan-deps',
 ]
 
 hooks = [
diff --git a/build/secondary/third_party/shaderc_flutter/BUILD.gn b/build/secondary/third_party/shaderc_flutter/BUILD.gn
@@ -12,11 +12,11 @@ source_set("shaderc_util_flutter") {
   public_configs = [ ":shaderc_util_config" ]
 
   configs +=
-      [ "//third_party/vulkan-deps/spirv-tools/src:spvtools_public_config" ]
+      [ "//flutter/third_party/vulkan-deps/spirv-tools/src:spvtools_public_config" ]
 
   public_deps = [
-    "//third_party/vulkan-deps/glslang/src:glslang_sources",
-    "//third_party/vulkan-deps/spirv-tools/src:spvtools",
+    "//flutter/third_party/vulkan-deps/glslang/src:glslang_sources",
+    "//flutter/third_party/vulkan-deps/spirv-tools/src:spvtools",
   ]
 
   defines = [ "ENABLE_HLSL=1" ]
@@ -62,13 +62,13 @@ source_set("shaderc_flutter") {
   public_configs = [ ":shaderc_config" ]
 
   configs +=
-      [ "//third_party/vulkan-deps/spirv-tools/src:spvtools_public_config" ]
+      [ "//flutter/third_party/vulkan-deps/spirv-tools/src:spvtools_public_config" ]
 
   deps = [ ":shaderc_util_flutter" ]
 
   public_deps = [
-    "//third_party/vulkan-deps/glslang/src:glslang_sources",
-    "//third_party/vulkan-deps/spirv-tools/src:spvtools",
+    "//flutter/third_party/vulkan-deps/glslang/src:glslang_sources",
+    "//flutter/third_party/vulkan-deps/spirv-tools/src:spvtools",
   ]
 
   sources = [
diff --git a/build/secondary/third_party/spirv_cross_flutter/BUILD.gn b/build/secondary/third_party/spirv_cross_flutter/BUILD.gn
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-source_root = "//third_party/vulkan-deps/spirv-cross/src"
+source_root = "//flutter/third_party/vulkan-deps/spirv-cross/src"
 
 config("spirv_cross_public") {
   include_dirs = [ source_root ]
diff --git a/build/secondary/third_party/vulkan_memory_allocator/BUILD.gn b/build/secondary/third_party/vulkan_memory_allocator/BUILD.gn
@@ -5,7 +5,7 @@
 # Custom GN integration for VulkanMemoryAllocator.
 
 declare_args() {
-  vma_vulkan_headers_dir = "//third_party/vulkan-deps/vulkan-headers/src"
+  vma_vulkan_headers_dir = "//flutter/third_party/vulkan-deps/vulkan-headers/src"
 }
 
 config("vulkan_memory_allocator_config") {
diff --git a/build/secondary/third_party/vulkan_validation_layers/BUILD.gn b/build/secondary/third_party/vulkan_validation_layers/BUILD.gn
@@ -4,7 +4,7 @@
 
 import("//build_overrides/vulkan_validation_layers.gni")
 
-_checkout_dir = "//third_party/vulkan-deps/vulkan-validation-layers/src"
+_checkout_dir = "//flutter/third_party/vulkan-deps/vulkan-validation-layers/src"
 
 vulkan_undefine_configs = []
 if (is_win) {
diff --git a/ci/licenses.sh b/ci/licenses.sh
@@ -162,7 +162,7 @@ function verify_licenses() (
 
   local actualLicenseCount
   actualLicenseCount="$(tail -n 1 flutter/ci/licenses_golden/licenses_flutter | tr -dc '0-9')"
-  local expectedLicenseCount=758 # When changing this number: Update the error message below as well describing the newly expected license types.
+  local expectedLicenseCount=842 # When changing this number: Update the error message below as well describing the newly expected license types.
 
   if [[ $actualLicenseCount -ne $expectedLicenseCount ]]; then
     echo "=============================== ERROR ==============================="
diff --git a/ci/licenses_golden/excluded_files b/ci/licenses_golden/excluded_files
diff --git a/ci/licenses_golden/licenses_flutter b/ci/licenses_golden/licenses_flutter
diff --git a/ci/licenses_golden/licenses_third_party b/ci/licenses_golden/licenses_third_party
diff --git a/ci/licenses_golden/tool_signature b/ci/licenses_golden/tool_signature
@@ -1,2 +1,2 @@
-Signature: 0efc328e1ec5308cf91a9069c33c0463
+Signature: 04fdc5b7c8d5b1690149c9aa20f4174d
 
diff --git a/common/graphics/BUILD.gn b/common/graphics/BUILD.gn
@@ -33,7 +33,8 @@ source_set("graphics") {
 
   public_configs = [ "//flutter:config" ]
   if (shell_enable_vulkan) {
-    public_deps =
-        [ "//third_party/vulkan-deps/vulkan-headers/src:vulkan_headers" ]
+    public_deps = [
+      "//flutter/third_party/vulkan-deps/vulkan-headers/src:vulkan_headers",
+    ]
   }
 }
diff --git a/examples/vulkan_glfw/BUILD.gn b/examples/vulkan_glfw/BUILD.gn
@@ -13,6 +13,6 @@ executable("vulkan_glfw") {
   deps = [
     "//flutter/shell/platform/embedder:embedder",
     "//flutter/third_party/glfw",
-    "//third_party/vulkan-deps/vulkan-headers/src:vulkan_headers",
+    "//flutter/third_party/vulkan-deps/vulkan-headers/src:vulkan_headers",
   ]
 }
diff --git a/flutter_vma/BUILD.gn b/flutter_vma/BUILD.gn
@@ -16,7 +16,7 @@ source_set("flutter_vma") {
 
   public_deps = [
     "//flutter/fml",
-    "//third_party/vulkan-deps/vulkan-headers/src:vulkan_headers",
+    "//flutter/third_party/vulkan-deps/vulkan-headers/src:vulkan_headers",
     "//third_party/vulkan_memory_allocator",
   ]
 
diff --git a/impeller/BUILD.gn b/impeller/BUILD.gn
@@ -116,7 +116,7 @@ impeller_component("impeller_unittests") {
   if (glfw_vulkan_library != "") {
     deps += [
       "//flutter/third_party/swiftshader",
-      "//third_party/vulkan-deps/vulkan-loader/src:libvulkan",
+      "//flutter/third_party/vulkan-deps/vulkan-loader/src:libvulkan",
       "//third_party/vulkan_validation_layers",
       "//third_party/vulkan_validation_layers:vulkan_gen_json_files",
     ]
diff --git a/impeller/compiler/BUILD.gn b/impeller/compiler/BUILD.gn
@@ -24,7 +24,7 @@ impeller_component("utilities") {
 }
 
 impeller_component("compiler_lib") {
-  include_dirs = [ "//third_party/vulkan-deps/spirv-cross/src/" ]
+  include_dirs = [ "//flutter/third_party/vulkan-deps/spirv-cross/src/" ]
 
   # Current versions of libcxx have deprecated some of the UTF-16 string
   # conversion APIs.
diff --git a/impeller/renderer/backend/vulkan/BUILD.gn b/impeller/renderer/backend/vulkan/BUILD.gn
@@ -122,7 +122,7 @@ impeller_component("vulkan") {
     "../../../shader_archive",
     "//flutter/flutter_vma",
     "//flutter/fml",
-    "//third_party/vulkan-deps/vulkan-headers/src:vulkan_headers",
+    "//flutter/third_party/vulkan-deps/vulkan-headers/src:vulkan_headers",
     "//third_party/vulkan_memory_allocator",
   ]
 }
diff --git a/shell/platform/embedder/BUILD.gn b/shell/platform/embedder/BUILD.gn
@@ -313,7 +313,7 @@ if (enable_unittests) {
 
       public_deps += [
         "//flutter/testing:opengl",
-        "//third_party/vulkan-deps/vulkan-headers/src:vulkan_headers",
+        "//flutter/third_party/vulkan-deps/vulkan-headers/src:vulkan_headers",
       ]
     }
 
diff --git a/tools/gn b/tools/gn
@@ -692,9 +692,9 @@ def to_gn_args(args):
     # Requires RTTI. We may want to build this in debug modes, punting on that
     # for now.
     gn_args['angle_enable_vulkan_validation_layers'] = False
-    gn_args['angle_vulkan_headers_dir'] = '//third_party/vulkan-deps/vulkan-headers/src'
-    gn_args['angle_vulkan_loader_dir'] = '//third_party/vulkan-deps/vulkan-loader/src'
-    gn_args['angle_vulkan_tools_dir'] = '//third_party/vulkan-deps/vulkan-tools/src'
+    gn_args['angle_vulkan_headers_dir'] = '//flutter/third_party/vulkan-deps/vulkan-headers/src'
+    gn_args['angle_vulkan_loader_dir'] = '//flutter/third_party/vulkan-deps/vulkan-loader/src'
+    gn_args['angle_vulkan_tools_dir'] = '//flutter/third_party/vulkan-deps/vulkan-tools/src'
 
   if args.darwin_extension_safe:
     gn_args['darwin_extension_safe'] = True
diff --git a/tools/licenses/lib/main.dart b/tools/licenses/lib/main.dart
@@ -999,13 +999,13 @@ class _RepositoryDirectory extends _RepositoryEntry implements LicenseSource {
     '/flutter/third_party/libpng/LICENSE': _RepositoryLibPngLicenseFile.new,
     '/flutter/third_party/rapidjson/LICENSE': _RepositoryOpaqueLicenseFile.new,
     '/flutter/third_party/rapidjson/license.txt': _RepositoryOpaqueLicenseFile.new,
+    '/flutter/third_party/vulkan-deps/vulkan-validation-layers/src/LICENSE.txt': _RepositoryVulkanApacheLicenseFile.new,
     '/fuchsia/sdk/linux/LICENSE.vulkan': _RepositoryFuchsiaSdkLinuxLicenseFile.new,
     '/fuchsia/sdk/mac/LICENSE.vulkan': _RepositoryFuchsiaSdkLinuxLicenseFile.new,
     '/third_party/dart/LICENSE': _RepositoryDartLicenseFile.new,
     '/third_party/khronos/LICENSE': _RepositoryKhronosLicenseFile.new,
     '/third_party/libcxx/LICENSE.TXT': _RepositoryCxxStlDualLicenseFile.new,
     '/third_party/libcxxabi/LICENSE.TXT': _RepositoryCxxStlDualLicenseFile.new,
-    '/third_party/vulkan-deps/vulkan-validation-layers/src/LICENSE.txt': _RepositoryVulkanApacheLicenseFile.new,
   };
 
   _RepositoryFile createFile(fs.IoNode entry) {
@@ -1443,9 +1443,6 @@ class _RepositoryRootThirdPartyDirectory extends _RepositoryGenericThirdPartyDir
     if (entry.name == 'icu') {
       return _RepositoryIcuDirectory(this, entry);
     }
-    if (entry.name == 'vulkan-deps') {
-      return _RepositoryGenericThirdPartyDirectory(this, entry);
-    }
     if (entry.name == 'zlib') {
       return _RepositoryZLibDirectory(this, entry);
     }
@@ -1762,6 +1759,9 @@ class _RepositoryFlutterThirdPartyDirectory extends _RepositoryGenericThirdParty
     if (entry.name == 'freetype2') {
       return _RepositoryFreetypeDirectory(this, entry);
     }
+    if (entry.name == 'vulkan-deps') {
+      return _RepositoryGenericThirdPartyDirectory(this, entry);
+    }
     return super.createSubdirectory(entry);
   }
 }
diff --git a/tools/licenses/lib/paths.dart b/tools/licenses/lib/paths.dart
@@ -120,6 +120,29 @@ final Set<String> skippedPaths = <String>{
   r'flutter/third_party/test_shaders', // for tests only
   r'flutter/third_party/tinygltf',
   r'flutter/third_party/txt/third_party/fonts',
+  r'flutter/third_party/vulkan-deps/glslang/LICENSE', // excluded to make sure we don't accidentally apply it as a default license
+  r'flutter/third_party/vulkan-deps/glslang/src/LICENSE.txt', // redundant with licenses inside files
+  r'flutter/third_party/vulkan-deps/glslang/src/glslang/OSDependent/Web', // we only use glslang in impellerc, not in web apps
+  r'flutter/third_party/vulkan-deps/glslang/src/kokoro', // only build files
+  r'flutter/third_party/vulkan-deps/spirv-cross/src/LICENSES', // directory with license templates
+  r'flutter/third_party/vulkan-deps/spirv-cross/src/shaders', // used by regression tests
+  r'flutter/third_party/vulkan-deps/spirv-cross/src/shaders-hlsl', // used by regression tests
+  r'flutter/third_party/vulkan-deps/spirv-cross/src/shaders-hlsl-no-opt', // used by regression tests
+  r'flutter/third_party/vulkan-deps/spirv-cross/src/shaders-msl', // used by regression tests
+  r'flutter/third_party/vulkan-deps/spirv-cross/src/shaders-msl-no-opt', // used by regression tests
+  r'flutter/third_party/vulkan-deps/spirv-cross/src/shaders-no-opt', // used by regression tests
+  r'flutter/third_party/vulkan-deps/spirv-cross/src/shaders-other', // used by regression tests
+  r'flutter/third_party/vulkan-deps/spirv-cross/src/shaders-reflection', // used by regression tests
+  r'flutter/third_party/vulkan-deps/spirv-cross/src/shaders-ue4', // used by regression tests
+  r'flutter/third_party/vulkan-deps/spirv-cross/src/shaders-ue4-no-opt', // used by regression tests
+  r'flutter/third_party/vulkan-deps/spirv-headers', // only used on hosts for tests
+  r'flutter/third_party/vulkan-deps/spirv-tools', // only used on hosts for tests
+  r'flutter/third_party/vulkan-deps/vulkan-headers/src/LICENSE.md', // redundant with licenses inside files
+  r'flutter/third_party/vulkan-deps/vulkan-headers/src/registry',
+  r'flutter/third_party/vulkan-deps/vulkan-loader', // on hosts for tests
+  r'flutter/third_party/vulkan-deps/vulkan-tools', // on hosts for tests
+  r'flutter/third_party/vulkan-deps/vulkan-utility-libraries/src/LICENSE.md', // redundant with licenses inside files
+  r'flutter/third_party/vulkan-deps/vulkan-validation-layers/src/docs',
   r'flutter/third_party/wuffs/docs',
   r'flutter/third_party/wuffs/script',
   r'flutter/third_party/yapf', // only used for code formatting
@@ -188,29 +211,6 @@ final Set<String> skippedPaths = <String>{
   r'third_party/perfetto/src/trace_processor', // contains nothing that ends up in the binary executable
   r'third_party/perfetto/src/traced', // contains nothing that ends up in the binary executable
   r'third_party/perfetto/src/tracing', // contains nothing that ends up in the binary executable
-  r'third_party/vulkan-deps/glslang/LICENSE', // excluded to make sure we don't accidentally apply it as a default license
-  r'third_party/vulkan-deps/glslang/src/LICENSE.txt', // redundant with licenses inside files
-  r'third_party/vulkan-deps/glslang/src/glslang/OSDependent/Web', // we only use glslang in impellerc, not in web apps
-  r'third_party/vulkan-deps/glslang/src/kokoro', // only build files
-  r'third_party/vulkan-deps/spirv-cross/src/LICENSES', // directory with license templates
-  r'third_party/vulkan-deps/spirv-cross/src/shaders', // used by regression tests
-  r'third_party/vulkan-deps/spirv-cross/src/shaders-hlsl', // used by regression tests
-  r'third_party/vulkan-deps/spirv-cross/src/shaders-hlsl-no-opt', // used by regression tests
-  r'third_party/vulkan-deps/spirv-cross/src/shaders-msl', // used by regression tests
-  r'third_party/vulkan-deps/spirv-cross/src/shaders-msl-no-opt', // used by regression tests
-  r'third_party/vulkan-deps/spirv-cross/src/shaders-no-opt', // used by regression tests
-  r'third_party/vulkan-deps/spirv-cross/src/shaders-other', // used by regression tests
-  r'third_party/vulkan-deps/spirv-cross/src/shaders-reflection', // used by regression tests
-  r'third_party/vulkan-deps/spirv-cross/src/shaders-ue4', // used by regression tests
-  r'third_party/vulkan-deps/spirv-cross/src/shaders-ue4-no-opt', // used by regression tests
-  r'third_party/vulkan-deps/spirv-headers', // only used on hosts for tests
-  r'third_party/vulkan-deps/spirv-tools', // only used on hosts for tests
-  r'third_party/vulkan-deps/vulkan-headers/src/LICENSE.md', // redundant with licenses inside files
-  r'third_party/vulkan-deps/vulkan-headers/src/registry',
-  r'third_party/vulkan-deps/vulkan-loader', // on hosts for tests
-  r'third_party/vulkan-deps/vulkan-tools', // on hosts for tests
-  r'third_party/vulkan-deps/vulkan-utility-libraries/src/LICENSE.md', // redundant with licenses inside files
-  r'third_party/vulkan-deps/vulkan-validation-layers/src/docs',
   r'third_party/vulkan_memory_allocator/bin',
   r'third_party/vulkan_memory_allocator/docs',
   r'third_party/vulkan_memory_allocator/media',
diff --git a/vulkan/BUILD.gn b/vulkan/BUILD.gn
@@ -51,5 +51,5 @@ source_set("vulkan") {
   public_configs = [ "//flutter:config" ]
 
   public_deps =
-      [ "//third_party/vulkan-deps/vulkan-headers/src:vulkan_headers" ]
+      [ "//flutter/third_party/vulkan-deps/vulkan-headers/src:vulkan_headers" ]
 }
diff --git a/vulkan/procs/BUILD.gn b/vulkan/procs/BUILD.gn
@@ -16,6 +16,6 @@ source_set("procs") {
 
   public_deps = [
     "//flutter/fml",
-    "//third_party/vulkan-deps/vulkan-headers/src:vulkan_headers",
+    "//flutter/third_party/vulkan-deps/vulkan-headers/src:vulkan_headers",
   ]
 }

Original file line number	Diff line number	Diff line change
`@@ -279,7 +279,7 @@ allowed_hosts = [`
`279`	`279`	`]`
`280`	`280`
`281`	`281`	`deps = {`
`282`		`- 'src': 'https://github.com/flutter/buildroot.git' + '@' + '21b1b9f2645fada701885108e86aefbcb3b1cca0',`
	`282`	`+ 'src': 'https://github.com/flutter/buildroot.git' + '@' + '2f684abc6e6bfba9062bd372929a8d458e03940a',`
`283`	`283`
`284`	`284`	`'src/flutter/third_party/depot_tools':`
`285`	`285`	`Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '580b4ff3f5cd0dcaa2eacda28cefe0f45320e8f7',`
`@@ -302,7 +302,7 @@ deps = {`
`302`	`302`	`'src/flutter/third_party/shaderc':`
`303`	`303`	`Var('chromium_git') + '/external/github.com/google/shaderc' + '@' + '37e25539ce199ecaf19fb7f7d27818716d36686d',`
`304`	`304`
`305`		`- 'src/third_party/vulkan-deps':`
	`305`	`+ 'src/flutter/third_party/vulkan-deps':`
`306`	`306`	`Var('chromium_git') + '/vulkan-deps' + '@' + '014f44e134a1de387791bffacc32ff9d8db71176',`
`307`	`307`
`308`	`308`	`'src/flutter/third_party/flatbuffers':`
`@@ -1063,7 +1063,7 @@ deps = {`
`1063`	`1063`	`}`
`1064`	`1064`
`1065`	`1065`	`recursedeps = [`
`1066`		`- 'src/third_party/vulkan-deps',`
	`1066`	`+ 'src/flutter/third_party/vulkan-deps',`
`1067`	`1067`	`]`
`1068`	`1068`
`1069`	`1069`	`hooks = [`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`# Custom GN integration for VulkanMemoryAllocator.`
`6`	`6`
`7`	`7`	`declare_args() {`
`8`		`- vma_vulkan_headers_dir = "//third_party/vulkan-deps/vulkan-headers/src"`
	`8`	`+ vma_vulkan_headers_dir = "//flutter/third_party/vulkan-deps/vulkan-headers/src"`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`config("vulkan_memory_allocator_config") {`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-Signature: 0efc328e1ec5308cf91a9069c33c0463`
	`1`	`+Signature: 04fdc5b7c8d5b1690149c9aa20f4174d`
`2`	`2`