Skip to content

Commit a5ed6ae

Browse files
jason-simmonsjason-simmons
authored
Remove the redirects from src/build_overrides to src/flutter/build_overrides (flutter#162553)
These were created when the buildroot and flutter/engine were separate repositories. They are no longer needed in the monorepo.
1 parent 78e5d79 commit a5ed6ae

23 files changed

+91
-169
lines changed

‎engine/src/build_overrides/angle.gni

Lines changed: 34 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,37 @@
22
# Use of this source code is governed by a BSD-style license that can be
33
# found in the LICENSE file.
44

5-
# This file is a temporary shim needed during the elimination of the buildroot.
6-
# See: https://github.com/flutter/flutter/issues/67373
7-
import("//flutter/build_overrides/angle.gni")
5+
# Ensure use_xcode_clang is visibile to ANGLE.
6+
import("//build/toolchain/toolchain.gni")
7+
8+
# The ANGLE build requires this file to point to the location of third-party
9+
# dependencies.
10+
angle_root = "//flutter/third_party/angle"
11+
12+
angle_vma_version = 30000001
13+
14+
# Flutter's buildroot looks enough like Chromium to satisfy Angle, and enough
15+
# to cause GN variable collisions if we don't set this.
16+
if (!is_fuchsia) {
17+
angle_has_build = true
18+
}
19+
20+
# Overrides for ANGLE's dependencies.
21+
angle_abseil_cpp_dir = "//flutter/third_party/abseil-cpp"
22+
angle_glslang_dir = "//flutter/third_party/vulkan-deps/glslang/src"
23+
angle_googletest_dir = "//third_party/googletest/googletest/src"
24+
25+
# Note: This path doesn't actually exist; see
26+
# //build/secondary/third_party/jsoncpp/BUILD.gn
27+
angle_jsoncpp_dir = "//third_party/jsoncpp"
28+
angle_libjpeg_turbo_dir = "//third_party/libjpeg_turbo"
29+
angle_libpng_dir = "//flutter/third_party/libpng"
30+
angle_spirv_headers_dir = "//flutter/third_party/vulkan-deps/spirv-headers/src"
31+
angle_spirv_tools_dir = "//flutter/third_party/vulkan-deps/spirv-tools/src"
32+
angle_spirv_cross_dir = "//flutter/third_party/vulkan-deps/spirv-cross/src"
33+
angle_spirv_headers_dir = "//flutter/third_party/vulkan-deps/spirv-headers/src"
34+
angle_vulkan_memory_allocator_dir = "//flutter/flutter_vma"
35+
36+
# This is a general Chromium flag, but in the Flutter build only ANGLE needs it
37+
# so it is defined here.
38+
is_cfi = false

‎engine/src/build_overrides/build.gni

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22
# Use of this source code is governed by a BSD-style license that can be
33
# found in the LICENSE file.
44

5-
# This file is a temporary shim needed during the elimination of the buildroot.
6-
# See: https://github.com/flutter/flutter/issues/67373
7-
import("//flutter/build_overrides/build.gni")
5+
# The engine build uses some Chromium-sourced versions of third-party
6+
# dependencies (e.g, ANGLE, abseil) to use their GN build files, but we don't
7+
# want the Chromium-specific parts of the build.
8+
build_with_chromium = false
9+
10+
# Perfetto targets fail to build without this variable. It is used by Perfetto
11+
# targets to distinguish embedder builds from Perfetto standalone builds, and
12+
# builds in the Android tree.
13+
perfetto_build_with_embedder = true
14+
15+
perfetto_root_path = "//flutter/third_party/perfetto/"

‎engine/src/build_overrides/glslang.gni

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@
22
# Use of this source code is governed by a BSD-style license that can be
33
# found in the LICENSE file.
44

5-
# This file is a temporary shim needed during the elimination of the buildroot.
6-
# See: https://github.com/flutter/flutter/issues/67373
7-
import("//flutter/build_overrides/glslang.gni")
5+
glslang_spirv_tools_dir = "//flutter/third_party/vulkan-deps/spirv-tools/src"
6+
spirv_tools_dir = "//flutter/third_party/vulkan-deps/spirv-tools/src"

‎engine/src/build_overrides/spirv_tools.gni

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
# Use of this source code is governed by a BSD-style license that can be
33
# found in the LICENSE file.
44

5-
# This file is a temporary shim needed during the elimination of the buildroot.
6-
# See: https://github.com/flutter/flutter/issues/67373
7-
import("//flutter/build_overrides/spirv_tools.gni")
5+
# We are building inside Flutter.
6+
spirv_tools_standalone = false
7+
8+
# Paths to SPIRV-Tools dependencies in Flutter.
9+
spirv_tools_googletest_dir = "//third_party/googletest/googletest/src"
10+
spirv_tools_spirv_headers_dir =
11+
"//flutter/third_party/vulkan-deps/spirv-headers/src"

‎engine/src/build_overrides/swiftshader.gni

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
# Use of this source code is governed by a BSD-style license that can be
33
# found in the LICENSE file.
44

5-
# This file is a temporary shim needed during the elimination of the buildroot.
6-
# See: https://github.com/flutter/flutter/issues/67373
7-
import("//flutter/build_overrides/swiftshader.gni")
5+
# We are building SwiftShader in Flutter.
6+
swiftshader_standalone = false
7+
8+
# Path to SwiftShader.
9+
swiftshader_dir = "//flutter/third_party/swiftshader"

‎engine/src/build_overrides/vulkan_headers.gni

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
# Use of this source code is governed by a BSD-style license that can be
33
# found in the LICENSE file.
44

5-
# This file is a temporary shim needed during the elimination of the buildroot.
6-
# See: https://github.com/flutter/flutter/issues/67373
7-
import("//flutter/build_overrides/vulkan_headers.gni")
5+
# This file is needed by the vulkan-headers build, but doesn't need to actually
6+
# set anything.
7+
8+
if (is_linux) {
9+
vulkan_use_x11 = true
10+
vulkan_use_wayland = true
11+
}

‎engine/src/build_overrides/vulkan_loader.gni

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
# Use of this source code is governed by a BSD-style license that can be
33
# found in the LICENSE file.
44

5-
# This file is a temporary shim needed during the elimination of the buildroot.
6-
# See: https://github.com/flutter/flutter/issues/67373
7-
import("//flutter/build_overrides/vulkan_loader.gni")
5+
vulkan_headers_dir = "//flutter/third_party/vulkan-deps/vulkan-headers/src"
6+
7+
# Vulkan loader build options
8+
vulkan_loader_shared = true

‎engine/src/build_overrides/vulkan_tools.gni

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
# Use of this source code is governed by a BSD-style license that can be
33
# found in the LICENSE file.
44

5-
# This file is a temporary shim needed during the elimination of the buildroot.
6-
# See: https://github.com/flutter/flutter/issues/67373
7-
import("//flutter/build_overrides/vulkan_tools.gni")
5+
vulkan_headers_dir = "//flutter/third_party/vulkan-deps/vulkan-headers/src"
6+
7+
# Subdirectories for generated files
8+
vulkan_data_subdir = ""
9+
vulkan_gen_subdir = ""

‎engine/src/build_overrides/vulkan_utility_libraries.gni

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,4 @@
22
# Use of this source code is governed by a BSD-style license that can be
33
# found in the LICENSE file.
44

5-
# This file is a temporary shim needed during the elimination of the buildroot.
6-
# See: https://github.com/flutter/flutter/issues/67373
7-
import("//flutter/build_overrides/vulkan_utility_libraries.gni")
5+
vulkan_headers_dir = "//flutter/third_party/vulkan-deps/vulkan-headers/src"

‎engine/src/build_overrides/vulkan_validation_layers.gni

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22
# Use of this source code is governed by a BSD-style license that can be
33
# found in the LICENSE file.
44

5-
# This file is a temporary shim needed during the elimination of the buildroot.
6-
# See: https://github.com/flutter/flutter/issues/67373
7-
import("//flutter/build_overrides/vulkan_validation_layers.gni")
5+
vulkan_headers_dir = "//flutter/third_party/vulkan-deps/vulkan-headers/src"
6+
vulkan_utility_libraries_dir =
7+
"//flutter/third_party/vulkan-deps/vulkan-utility-libraries/src"
8+
vvl_spirv_tools_dir = "//flutter/third_party/vulkan-deps/spirv-tools/src"
9+
vvl_glslang_dir = "//flutter/third_party/vulkan-deps/spirv-tools/src"
10+
11+
# robin_hood_headers_dir = "//external/robin-hood-hashing/src/include"
12+
13+
# Subdirectories for generated files
14+
vulkan_data_subdir = "vulkan-data"
15+
vulkan_gen_subdir = ""

0 commit comments

Comments
 (0)