Remove the redirects from src/build_overrides to src/flutter/build_overrides (#162553)
These were created when the buildroot and flutter/engine were separate repositories. They are no longer needed in the monorepo.
This commit is contained in:
Jason Simmons
GitHub
parent
78e5d7995c
commit
a5ed6aea7a
@ -2,6 +2,37 @@
|
|||||||
# Use of this source code is governed by a BSD-style license that can be
|
# Use of this source code is governed by a BSD-style license that can be
|
||||||
# found in the LICENSE file.
|
# found in the LICENSE file.
|
||||||
|
|
||||||
# This file is a temporary shim needed during the elimination of the buildroot.
|
# Ensure use_xcode_clang is visibile to ANGLE.
|
||||||
# See: https://github.com/flutter/flutter/issues/67373
|
import("//build/toolchain/toolchain.gni")
|
||||||
import("//flutter/build_overrides/angle.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
|
||||||
|
|||||||
@ -2,6 +2,14 @@
|
|||||||
# Use of this source code is governed by a BSD-style license that can be
|
# Use of this source code is governed by a BSD-style license that can be
|
||||||
# found in the LICENSE file.
|
# found in the LICENSE file.
|
||||||
|
|
||||||
# This file is a temporary shim needed during the elimination of the buildroot.
|
# The engine build uses some Chromium-sourced versions of third-party
|
||||||
# See: https://github.com/flutter/flutter/issues/67373
|
# dependencies (e.g, ANGLE, abseil) to use their GN build files, but we don't
|
||||||
import("//flutter/build_overrides/build.gni")
|
# 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/"
|
||||||
|
|||||||
@ -2,6 +2,5 @@
|
|||||||
# Use of this source code is governed by a BSD-style license that can be
|
# Use of this source code is governed by a BSD-style license that can be
|
||||||
# found in the LICENSE file.
|
# found in the LICENSE file.
|
||||||
|
|
||||||
# This file is a temporary shim needed during the elimination of the buildroot.
|
glslang_spirv_tools_dir = "//flutter/third_party/vulkan-deps/spirv-tools/src"
|
||||||
# See: https://github.com/flutter/flutter/issues/67373
|
spirv_tools_dir = "//flutter/third_party/vulkan-deps/spirv-tools/src"
|
||||||
import("//flutter/build_overrides/glslang.gni")
|
|
||||||
|
|||||||
@ -2,6 +2,10 @@
|
|||||||
# Use of this source code is governed by a BSD-style license that can be
|
# Use of this source code is governed by a BSD-style license that can be
|
||||||
# found in the LICENSE file.
|
# found in the LICENSE file.
|
||||||
|
|
||||||
# This file is a temporary shim needed during the elimination of the buildroot.
|
# We are building inside Flutter.
|
||||||
# See: https://github.com/flutter/flutter/issues/67373
|
spirv_tools_standalone = false
|
||||||
import("//flutter/build_overrides/spirv_tools.gni")
|
|
||||||
|
# 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"
|
||||||
|
|||||||
@ -2,6 +2,8 @@
|
|||||||
# Use of this source code is governed by a BSD-style license that can be
|
# Use of this source code is governed by a BSD-style license that can be
|
||||||
# found in the LICENSE file.
|
# found in the LICENSE file.
|
||||||
|
|
||||||
# This file is a temporary shim needed during the elimination of the buildroot.
|
# We are building SwiftShader in Flutter.
|
||||||
# See: https://github.com/flutter/flutter/issues/67373
|
swiftshader_standalone = false
|
||||||
import("//flutter/build_overrides/swiftshader.gni")
|
|
||||||
|
# Path to SwiftShader.
|
||||||
|
swiftshader_dir = "//flutter/third_party/swiftshader"
|
||||||
|
|||||||
@ -2,6 +2,10 @@
|
|||||||
# Use of this source code is governed by a BSD-style license that can be
|
# Use of this source code is governed by a BSD-style license that can be
|
||||||
# found in the LICENSE file.
|
# found in the LICENSE file.
|
||||||
|
|
||||||
# This file is a temporary shim needed during the elimination of the buildroot.
|
# This file is needed by the vulkan-headers build, but doesn't need to actually
|
||||||
# See: https://github.com/flutter/flutter/issues/67373
|
# set anything.
|
||||||
import("//flutter/build_overrides/vulkan_headers.gni")
|
|
||||||
|
if (is_linux) {
|
||||||
|
vulkan_use_x11 = true
|
||||||
|
vulkan_use_wayland = true
|
||||||
|
}
|
||||||
|
|||||||
@ -2,6 +2,7 @@
|
|||||||
# Use of this source code is governed by a BSD-style license that can be
|
# Use of this source code is governed by a BSD-style license that can be
|
||||||
# found in the LICENSE file.
|
# found in the LICENSE file.
|
||||||
|
|
||||||
# This file is a temporary shim needed during the elimination of the buildroot.
|
vulkan_headers_dir = "//flutter/third_party/vulkan-deps/vulkan-headers/src"
|
||||||
# See: https://github.com/flutter/flutter/issues/67373
|
|
||||||
import("//flutter/build_overrides/vulkan_loader.gni")
|
# Vulkan loader build options
|
||||||
|
vulkan_loader_shared = true
|
||||||
|
|||||||
@ -2,6 +2,8 @@
|
|||||||
# Use of this source code is governed by a BSD-style license that can be
|
# Use of this source code is governed by a BSD-style license that can be
|
||||||
# found in the LICENSE file.
|
# found in the LICENSE file.
|
||||||
|
|
||||||
# This file is a temporary shim needed during the elimination of the buildroot.
|
vulkan_headers_dir = "//flutter/third_party/vulkan-deps/vulkan-headers/src"
|
||||||
# See: https://github.com/flutter/flutter/issues/67373
|
|
||||||
import("//flutter/build_overrides/vulkan_tools.gni")
|
# Subdirectories for generated files
|
||||||
|
vulkan_data_subdir = ""
|
||||||
|
vulkan_gen_subdir = ""
|
||||||
|
|||||||
@ -2,6 +2,4 @@
|
|||||||
# Use of this source code is governed by a BSD-style license that can be
|
# Use of this source code is governed by a BSD-style license that can be
|
||||||
# found in the LICENSE file.
|
# found in the LICENSE file.
|
||||||
|
|
||||||
# This file is a temporary shim needed during the elimination of the buildroot.
|
vulkan_headers_dir = "//flutter/third_party/vulkan-deps/vulkan-headers/src"
|
||||||
# See: https://github.com/flutter/flutter/issues/67373
|
|
||||||
import("//flutter/build_overrides/vulkan_utility_libraries.gni")
|
|
||||||
|
|||||||
@ -2,6 +2,14 @@
|
|||||||
# Use of this source code is governed by a BSD-style license that can be
|
# Use of this source code is governed by a BSD-style license that can be
|
||||||
# found in the LICENSE file.
|
# found in the LICENSE file.
|
||||||
|
|
||||||
# This file is a temporary shim needed during the elimination of the buildroot.
|
vulkan_headers_dir = "//flutter/third_party/vulkan-deps/vulkan-headers/src"
|
||||||
# See: https://github.com/flutter/flutter/issues/67373
|
vulkan_utility_libraries_dir =
|
||||||
import("//flutter/build_overrides/vulkan_validation_layers.gni")
|
"//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 = ""
|
||||||
|
|||||||
@ -2,6 +2,7 @@
|
|||||||
# Use of this source code is governed by a BSD-style license that can be
|
# Use of this source code is governed by a BSD-style license that can be
|
||||||
# found in the LICENSE file.
|
# found in the LICENSE file.
|
||||||
|
|
||||||
# This file is a temporary shim needed during the elimination of the buildroot.
|
# ANGLE expects this to be here.
|
||||||
# See: https://github.com/flutter/flutter/issues/67373
|
|
||||||
import("//flutter/build_overrides/wayland.gni")
|
# Flutter has no wayland third-party dir
|
||||||
|
wayland_gn_dir = ""
|
||||||
|
|||||||
@ -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
|
|
||||||
@ -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/"
|
|
||||||
@ -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"
|
|
||||||
@ -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"
|
|
||||||
@ -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"
|
|
||||||
@ -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
|
|
||||||
}
|
|
||||||
@ -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
|
|
||||||
@ -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 = ""
|
|
||||||
@ -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"
|
|
||||||
@ -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 = ""
|
|
||||||
@ -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 = ""
|
|
||||||
@ -23,7 +23,6 @@
|
|||||||
../../../flutter/analysis_options.yaml
|
../../../flutter/analysis_options.yaml
|
||||||
../../../flutter/assets/native_assets_unittests.cc
|
../../../flutter/assets/native_assets_unittests.cc
|
||||||
../../../flutter/build
|
../../../flutter/build
|
||||||
../../../flutter/build_overrides
|
|
||||||
../../../flutter/buildtools
|
../../../flutter/buildtools
|
||||||
../../../flutter/ci
|
../../../flutter/ci
|
||||||
../../../flutter/common/README.md
|
../../../flutter/common/README.md
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user