diff --git a/engine/src/build_overrides/angle.gni b/engine/src/build_overrides/angle.gni index 57f1e6dfc4..2ee36b37e9 100644 --- a/engine/src/build_overrides/angle.gni +++ b/engine/src/build_overrides/angle.gni @@ -2,6 +2,37 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -# This file is a temporary shim needed during the elimination of the buildroot. -# See: https://github.com/flutter/flutter/issues/67373 -import("//flutter/build_overrides/angle.gni") +# Ensure use_xcode_clang is visibile to ANGLE. +import("//build/toolchain/toolchain.gni") + +# The ANGLE build requires this file to point to the location of third-party +# dependencies. +angle_root = "//flutter/third_party/angle" + +angle_vma_version = 30000001 + +# Flutter's buildroot looks enough like Chromium to satisfy Angle, and enough +# to cause GN variable collisions if we don't set this. +if (!is_fuchsia) { + angle_has_build = true +} + +# Overrides for ANGLE's dependencies. +angle_abseil_cpp_dir = "//flutter/third_party/abseil-cpp" +angle_glslang_dir = "//flutter/third_party/vulkan-deps/glslang/src" +angle_googletest_dir = "//third_party/googletest/googletest/src" + +# Note: This path doesn't actually exist; see +# //build/secondary/third_party/jsoncpp/BUILD.gn +angle_jsoncpp_dir = "//third_party/jsoncpp" +angle_libjpeg_turbo_dir = "//third_party/libjpeg_turbo" +angle_libpng_dir = "//flutter/third_party/libpng" +angle_spirv_headers_dir = "//flutter/third_party/vulkan-deps/spirv-headers/src" +angle_spirv_tools_dir = "//flutter/third_party/vulkan-deps/spirv-tools/src" +angle_spirv_cross_dir = "//flutter/third_party/vulkan-deps/spirv-cross/src" +angle_spirv_headers_dir = "//flutter/third_party/vulkan-deps/spirv-headers/src" +angle_vulkan_memory_allocator_dir = "//flutter/flutter_vma" + +# This is a general Chromium flag, but in the Flutter build only ANGLE needs it +# so it is defined here. +is_cfi = false diff --git a/engine/src/build_overrides/build.gni b/engine/src/build_overrides/build.gni index cd4981258c..e7fdeb80d6 100644 --- a/engine/src/build_overrides/build.gni +++ b/engine/src/build_overrides/build.gni @@ -2,6 +2,14 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -# This file is a temporary shim needed during the elimination of the buildroot. -# See: https://github.com/flutter/flutter/issues/67373 -import("//flutter/build_overrides/build.gni") +# The engine build uses some Chromium-sourced versions of third-party +# dependencies (e.g, ANGLE, abseil) to use their GN build files, but we don't +# want the Chromium-specific parts of the build. +build_with_chromium = false + +# Perfetto targets fail to build without this variable. It is used by Perfetto +# targets to distinguish embedder builds from Perfetto standalone builds, and +# builds in the Android tree. +perfetto_build_with_embedder = true + +perfetto_root_path = "//flutter/third_party/perfetto/" diff --git a/engine/src/build_overrides/glslang.gni b/engine/src/build_overrides/glslang.gni index f52e381e82..cf25687630 100644 --- a/engine/src/build_overrides/glslang.gni +++ b/engine/src/build_overrides/glslang.gni @@ -2,6 +2,5 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -# This file is a temporary shim needed during the elimination of the buildroot. -# See: https://github.com/flutter/flutter/issues/67373 -import("//flutter/build_overrides/glslang.gni") +glslang_spirv_tools_dir = "//flutter/third_party/vulkan-deps/spirv-tools/src" +spirv_tools_dir = "//flutter/third_party/vulkan-deps/spirv-tools/src" diff --git a/engine/src/build_overrides/spirv_tools.gni b/engine/src/build_overrides/spirv_tools.gni index 5f153fb120..1f1494927e 100644 --- a/engine/src/build_overrides/spirv_tools.gni +++ b/engine/src/build_overrides/spirv_tools.gni @@ -2,6 +2,10 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -# This file is a temporary shim needed during the elimination of the buildroot. -# See: https://github.com/flutter/flutter/issues/67373 -import("//flutter/build_overrides/spirv_tools.gni") +# We are building inside Flutter. +spirv_tools_standalone = false + +# Paths to SPIRV-Tools dependencies in Flutter. +spirv_tools_googletest_dir = "//third_party/googletest/googletest/src" +spirv_tools_spirv_headers_dir = + "//flutter/third_party/vulkan-deps/spirv-headers/src" diff --git a/engine/src/build_overrides/swiftshader.gni b/engine/src/build_overrides/swiftshader.gni index e9ef400e7f..466a544874 100644 --- a/engine/src/build_overrides/swiftshader.gni +++ b/engine/src/build_overrides/swiftshader.gni @@ -2,6 +2,8 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -# This file is a temporary shim needed during the elimination of the buildroot. -# See: https://github.com/flutter/flutter/issues/67373 -import("//flutter/build_overrides/swiftshader.gni") +# We are building SwiftShader in Flutter. +swiftshader_standalone = false + +# Path to SwiftShader. +swiftshader_dir = "//flutter/third_party/swiftshader" diff --git a/engine/src/build_overrides/vulkan_headers.gni b/engine/src/build_overrides/vulkan_headers.gni index 6a5a5b018a..5efa852344 100644 --- a/engine/src/build_overrides/vulkan_headers.gni +++ b/engine/src/build_overrides/vulkan_headers.gni @@ -2,6 +2,10 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -# This file is a temporary shim needed during the elimination of the buildroot. -# See: https://github.com/flutter/flutter/issues/67373 -import("//flutter/build_overrides/vulkan_headers.gni") +# This file is needed by the vulkan-headers build, but doesn't need to actually +# set anything. + +if (is_linux) { + vulkan_use_x11 = true + vulkan_use_wayland = true +} diff --git a/engine/src/build_overrides/vulkan_loader.gni b/engine/src/build_overrides/vulkan_loader.gni index a4ab2a9149..b828448e8b 100644 --- a/engine/src/build_overrides/vulkan_loader.gni +++ b/engine/src/build_overrides/vulkan_loader.gni @@ -2,6 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -# This file is a temporary shim needed during the elimination of the buildroot. -# See: https://github.com/flutter/flutter/issues/67373 -import("//flutter/build_overrides/vulkan_loader.gni") +vulkan_headers_dir = "//flutter/third_party/vulkan-deps/vulkan-headers/src" + +# Vulkan loader build options +vulkan_loader_shared = true diff --git a/engine/src/build_overrides/vulkan_tools.gni b/engine/src/build_overrides/vulkan_tools.gni index 2edf3dab8a..a0fbede405 100644 --- a/engine/src/build_overrides/vulkan_tools.gni +++ b/engine/src/build_overrides/vulkan_tools.gni @@ -2,6 +2,8 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -# This file is a temporary shim needed during the elimination of the buildroot. -# See: https://github.com/flutter/flutter/issues/67373 -import("//flutter/build_overrides/vulkan_tools.gni") +vulkan_headers_dir = "//flutter/third_party/vulkan-deps/vulkan-headers/src" + +# Subdirectories for generated files +vulkan_data_subdir = "" +vulkan_gen_subdir = "" diff --git a/engine/src/build_overrides/vulkan_utility_libraries.gni b/engine/src/build_overrides/vulkan_utility_libraries.gni index 20ba694c9e..245ffceeca 100644 --- a/engine/src/build_overrides/vulkan_utility_libraries.gni +++ b/engine/src/build_overrides/vulkan_utility_libraries.gni @@ -2,6 +2,4 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -# This file is a temporary shim needed during the elimination of the buildroot. -# See: https://github.com/flutter/flutter/issues/67373 -import("//flutter/build_overrides/vulkan_utility_libraries.gni") +vulkan_headers_dir = "//flutter/third_party/vulkan-deps/vulkan-headers/src" diff --git a/engine/src/build_overrides/vulkan_validation_layers.gni b/engine/src/build_overrides/vulkan_validation_layers.gni index 99877feb98..1378a5a9de 100644 --- a/engine/src/build_overrides/vulkan_validation_layers.gni +++ b/engine/src/build_overrides/vulkan_validation_layers.gni @@ -2,6 +2,14 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -# This file is a temporary shim needed during the elimination of the buildroot. -# See: https://github.com/flutter/flutter/issues/67373 -import("//flutter/build_overrides/vulkan_validation_layers.gni") +vulkan_headers_dir = "//flutter/third_party/vulkan-deps/vulkan-headers/src" +vulkan_utility_libraries_dir = + "//flutter/third_party/vulkan-deps/vulkan-utility-libraries/src" +vvl_spirv_tools_dir = "//flutter/third_party/vulkan-deps/spirv-tools/src" +vvl_glslang_dir = "//flutter/third_party/vulkan-deps/spirv-tools/src" + +# robin_hood_headers_dir = "//external/robin-hood-hashing/src/include" + +# Subdirectories for generated files +vulkan_data_subdir = "vulkan-data" +vulkan_gen_subdir = "" diff --git a/engine/src/build_overrides/wayland.gni b/engine/src/build_overrides/wayland.gni index 72fb4b4152..d3d82c33c8 100644 --- a/engine/src/build_overrides/wayland.gni +++ b/engine/src/build_overrides/wayland.gni @@ -2,6 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -# This file is a temporary shim needed during the elimination of the buildroot. -# See: https://github.com/flutter/flutter/issues/67373 -import("//flutter/build_overrides/wayland.gni") +# ANGLE expects this to be here. + +# Flutter has no wayland third-party dir +wayland_gn_dir = "" diff --git a/engine/src/flutter/build_overrides/angle.gni b/engine/src/flutter/build_overrides/angle.gni deleted file mode 100644 index 2ee36b37e9..0000000000 --- a/engine/src/flutter/build_overrides/angle.gni +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 2019 The Flutter Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -# Ensure use_xcode_clang is visibile to ANGLE. -import("//build/toolchain/toolchain.gni") - -# The ANGLE build requires this file to point to the location of third-party -# dependencies. -angle_root = "//flutter/third_party/angle" - -angle_vma_version = 30000001 - -# Flutter's buildroot looks enough like Chromium to satisfy Angle, and enough -# to cause GN variable collisions if we don't set this. -if (!is_fuchsia) { - angle_has_build = true -} - -# Overrides for ANGLE's dependencies. -angle_abseil_cpp_dir = "//flutter/third_party/abseil-cpp" -angle_glslang_dir = "//flutter/third_party/vulkan-deps/glslang/src" -angle_googletest_dir = "//third_party/googletest/googletest/src" - -# Note: This path doesn't actually exist; see -# //build/secondary/third_party/jsoncpp/BUILD.gn -angle_jsoncpp_dir = "//third_party/jsoncpp" -angle_libjpeg_turbo_dir = "//third_party/libjpeg_turbo" -angle_libpng_dir = "//flutter/third_party/libpng" -angle_spirv_headers_dir = "//flutter/third_party/vulkan-deps/spirv-headers/src" -angle_spirv_tools_dir = "//flutter/third_party/vulkan-deps/spirv-tools/src" -angle_spirv_cross_dir = "//flutter/third_party/vulkan-deps/spirv-cross/src" -angle_spirv_headers_dir = "//flutter/third_party/vulkan-deps/spirv-headers/src" -angle_vulkan_memory_allocator_dir = "//flutter/flutter_vma" - -# This is a general Chromium flag, but in the Flutter build only ANGLE needs it -# so it is defined here. -is_cfi = false diff --git a/engine/src/flutter/build_overrides/build.gni b/engine/src/flutter/build_overrides/build.gni deleted file mode 100644 index e7fdeb80d6..0000000000 --- a/engine/src/flutter/build_overrides/build.gni +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 2019 The Flutter Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -# The engine build uses some Chromium-sourced versions of third-party -# dependencies (e.g, ANGLE, abseil) to use their GN build files, but we don't -# want the Chromium-specific parts of the build. -build_with_chromium = false - -# Perfetto targets fail to build without this variable. It is used by Perfetto -# targets to distinguish embedder builds from Perfetto standalone builds, and -# builds in the Android tree. -perfetto_build_with_embedder = true - -perfetto_root_path = "//flutter/third_party/perfetto/" diff --git a/engine/src/flutter/build_overrides/glslang.gni b/engine/src/flutter/build_overrides/glslang.gni deleted file mode 100644 index cf25687630..0000000000 --- a/engine/src/flutter/build_overrides/glslang.gni +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright 2019 The Flutter Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -glslang_spirv_tools_dir = "//flutter/third_party/vulkan-deps/spirv-tools/src" -spirv_tools_dir = "//flutter/third_party/vulkan-deps/spirv-tools/src" diff --git a/engine/src/flutter/build_overrides/spirv_tools.gni b/engine/src/flutter/build_overrides/spirv_tools.gni deleted file mode 100644 index 1f1494927e..0000000000 --- a/engine/src/flutter/build_overrides/spirv_tools.gni +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 2019 The Flutter Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -# We are building inside Flutter. -spirv_tools_standalone = false - -# Paths to SPIRV-Tools dependencies in Flutter. -spirv_tools_googletest_dir = "//third_party/googletest/googletest/src" -spirv_tools_spirv_headers_dir = - "//flutter/third_party/vulkan-deps/spirv-headers/src" diff --git a/engine/src/flutter/build_overrides/swiftshader.gni b/engine/src/flutter/build_overrides/swiftshader.gni deleted file mode 100644 index 466a544874..0000000000 --- a/engine/src/flutter/build_overrides/swiftshader.gni +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright 2019 The Flutter Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -# We are building SwiftShader in Flutter. -swiftshader_standalone = false - -# Path to SwiftShader. -swiftshader_dir = "//flutter/third_party/swiftshader" diff --git a/engine/src/flutter/build_overrides/vulkan_headers.gni b/engine/src/flutter/build_overrides/vulkan_headers.gni deleted file mode 100644 index 5efa852344..0000000000 --- a/engine/src/flutter/build_overrides/vulkan_headers.gni +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 2020 The Flutter Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -# This file is needed by the vulkan-headers build, but doesn't need to actually -# set anything. - -if (is_linux) { - vulkan_use_x11 = true - vulkan_use_wayland = true -} diff --git a/engine/src/flutter/build_overrides/vulkan_loader.gni b/engine/src/flutter/build_overrides/vulkan_loader.gni deleted file mode 100644 index b828448e8b..0000000000 --- a/engine/src/flutter/build_overrides/vulkan_loader.gni +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright 2020 The Flutter Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -vulkan_headers_dir = "//flutter/third_party/vulkan-deps/vulkan-headers/src" - -# Vulkan loader build options -vulkan_loader_shared = true diff --git a/engine/src/flutter/build_overrides/vulkan_tools.gni b/engine/src/flutter/build_overrides/vulkan_tools.gni deleted file mode 100644 index a0fbede405..0000000000 --- a/engine/src/flutter/build_overrides/vulkan_tools.gni +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright 2020 The Flutter Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -vulkan_headers_dir = "//flutter/third_party/vulkan-deps/vulkan-headers/src" - -# Subdirectories for generated files -vulkan_data_subdir = "" -vulkan_gen_subdir = "" diff --git a/engine/src/flutter/build_overrides/vulkan_utility_libraries.gni b/engine/src/flutter/build_overrides/vulkan_utility_libraries.gni deleted file mode 100644 index 245ffceeca..0000000000 --- a/engine/src/flutter/build_overrides/vulkan_utility_libraries.gni +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright 2013 The Flutter Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -vulkan_headers_dir = "//flutter/third_party/vulkan-deps/vulkan-headers/src" diff --git a/engine/src/flutter/build_overrides/vulkan_validation_layers.gni b/engine/src/flutter/build_overrides/vulkan_validation_layers.gni deleted file mode 100644 index 1378a5a9de..0000000000 --- a/engine/src/flutter/build_overrides/vulkan_validation_layers.gni +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 2020 The Flutter Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -vulkan_headers_dir = "//flutter/third_party/vulkan-deps/vulkan-headers/src" -vulkan_utility_libraries_dir = - "//flutter/third_party/vulkan-deps/vulkan-utility-libraries/src" -vvl_spirv_tools_dir = "//flutter/third_party/vulkan-deps/spirv-tools/src" -vvl_glslang_dir = "//flutter/third_party/vulkan-deps/spirv-tools/src" - -# robin_hood_headers_dir = "//external/robin-hood-hashing/src/include" - -# Subdirectories for generated files -vulkan_data_subdir = "vulkan-data" -vulkan_gen_subdir = "" diff --git a/engine/src/flutter/build_overrides/wayland.gni b/engine/src/flutter/build_overrides/wayland.gni deleted file mode 100644 index d3d82c33c8..0000000000 --- a/engine/src/flutter/build_overrides/wayland.gni +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright 2019 The Flutter Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -# ANGLE expects this to be here. - -# Flutter has no wayland third-party dir -wayland_gn_dir = "" diff --git a/engine/src/flutter/ci/licenses_golden/excluded_files b/engine/src/flutter/ci/licenses_golden/excluded_files index fa3a3ebbe2..30fd45fb30 100644 --- a/engine/src/flutter/ci/licenses_golden/excluded_files +++ b/engine/src/flutter/ci/licenses_golden/excluded_files @@ -23,7 +23,6 @@ ../../../flutter/analysis_options.yaml ../../../flutter/assets/native_assets_unittests.cc ../../../flutter/build -../../../flutter/build_overrides ../../../flutter/buildtools ../../../flutter/ci ../../../flutter/common/README.md