Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ allowed_hosts = [
]

deps = {
'src': 'https://github.com/flutter/buildroot.git' + '@' + '7840a4af027fc21161d4ae14a3d4d9c9bab049a2',
'src': 'https://github.com/flutter/buildroot.git' + '@' + '7f832aed9b02b6da55756234b85e753d0411855e',

'src/flutter/third_party/depot_tools':
Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '580b4ff3f5cd0dcaa2eacda28cefe0f45320e8f7',
Expand All @@ -288,10 +288,10 @@ deps = {
'src/flutter/third_party/harfbuzz':
Var('flutter_git') + '/third_party/harfbuzz' + '@' + 'ea8f97c615f0ba17dc25013ef67dbd6bfaaa76f2',

'src/third_party/libcxx':
'src/flutter/third_party/libcxx':
Var('llvm_git') + '/llvm-project/libcxx' + '@' + '44079a4cc04cdeffb9cfe8067bfb3c276fb2bab0',

'src/third_party/libcxxabi':
'src/flutter/third_party/libcxxabi':
Var('llvm_git') + '/llvm-project/libcxxabi' + '@' + '2ce528fb5e0f92e57c97ec3ff53b75359d33af12',

'src/flutter/third_party/glfw':
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

config("libcxx_config") {
defines = [ "_LIBCPP_DISABLE_AVAILABILITY=1" ]
include_dirs = [ "//flutter/build/secondary/third_party/libcxx/config" ]
include_dirs = [ "//flutter/build/secondary/flutter/third_party/libcxx/config" ]
}

config("src_include") {
Expand Down Expand Up @@ -56,7 +56,7 @@ source_set("libcxx") {
"src/vector.cpp",
]

deps = [ "//third_party/libcxxabi" ]
deps = [ "//flutter/third_party/libcxxabi" ]

# TODO(goderbauer): remove when all sources build with LTO for android_arm64 and android_x64.
if (is_android && (current_cpu == "arm64" || current_cpu == "x64")) {
Expand All @@ -66,7 +66,7 @@ source_set("libcxx") {

public_configs = [
":libcxx_config",
"//third_party/libcxxabi:libcxxabi_config",
"//flutter/third_party/libcxxabi:libcxxabi_config",
]

defines = [
Expand Down Expand Up @@ -101,11 +101,11 @@ source_set("libcxx_nolto") {

cflags_cc = [ "-fno-lto" ]

deps = [ "//third_party/libcxxabi" ]
deps = [ "//flutter/third_party/libcxxabi" ]

public_configs = [
":libcxx_config",
"//third_party/libcxxabi:libcxxabi_config",
"//flutter/third_party/libcxxabi:libcxxabi_config",
]

defines = [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ source_set("libcxxabi") {
configs -= [ "//build/config/compiler:cxx_version_default" ]
configs += [ "//build/config/compiler:cxx_version_20" ]

configs += [ "//third_party/libcxx:src_include" ]
configs += [ "//flutter/third_party/libcxx:src_include" ]

# No translation units in the engine are built with exceptions. But, using
# Objective-C exceptions requires some infrastructure setup for exceptions.
Expand Down
2 changes: 1 addition & 1 deletion ci/licenses.sh
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ function verify_licenses() (

local actualLicenseCount
actualLicenseCount="$(tail -n 1 flutter/ci/licenses_golden/licenses_flutter | tr -dc '0-9')"
local expectedLicenseCount=899 # When changing this number: Update the error message below as well describing the newly expected license types.
local expectedLicenseCount=903 # When changing this number: Update the error message below as well describing the newly expected license types.

if [[ $actualLicenseCount -ne $expectedLicenseCount ]]; then
echo "=============================== ERROR ==============================="
Expand Down
75 changes: 36 additions & 39 deletions ci/licenses_golden/excluded_files
Original file line number Diff line number Diff line change
Expand Up @@ -2093,6 +2093,41 @@
../../../flutter/third_party/json/tools/serve_header/README.md
../../../flutter/third_party/json/tools/serve_header/requirements.txt
../../../flutter/third_party/json/tools/serve_header/serve_header.py
../../../flutter/third_party/libcxx/.clang-format
../../../flutter/third_party/libcxx/.clang-tidy
../../../flutter/third_party/libcxx/.git
../../../flutter/third_party/libcxx/.gitignore
../../../flutter/third_party/libcxx/CMakeLists.txt
../../../flutter/third_party/libcxx/CREDITS.TXT
../../../flutter/third_party/libcxx/TODO.TXT
../../../flutter/third_party/libcxx/appveyor-reqs-install.cmd
../../../flutter/third_party/libcxx/appveyor.yml
../../../flutter/third_party/libcxx/benchmarks
../../../flutter/third_party/libcxx/cmake
../../../flutter/third_party/libcxx/docs
../../../flutter/third_party/libcxx/include/CMakeLists.txt
../../../flutter/third_party/libcxx/include/version
../../../flutter/third_party/libcxx/lib/abi/CHANGELOG.TXT
../../../flutter/third_party/libcxx/lib/abi/CMakeLists.txt
../../../flutter/third_party/libcxx/lib/abi/README.TXT
../../../flutter/third_party/libcxx/src/CMakeLists.txt
../../../flutter/third_party/libcxx/src/ryu/README.txt
../../../flutter/third_party/libcxx/src/support/solaris
../../../flutter/third_party/libcxx/test
../../../flutter/third_party/libcxx/utils
../../../flutter/third_party/libcxxabi/.clang-format
../../../flutter/third_party/libcxxabi/.git
../../../flutter/third_party/libcxxabi/.gitignore
../../../flutter/third_party/libcxxabi/CMakeLists.txt
../../../flutter/third_party/libcxxabi/CREDITS.TXT
../../../flutter/third_party/libcxxabi/cmake
../../../flutter/third_party/libcxxabi/fuzz/CMakeLists.txt
../../../flutter/third_party/libcxxabi/include/CMakeLists.txt
../../../flutter/third_party/libcxxabi/src/CMakeLists.txt
../../../flutter/third_party/libcxxabi/src/demangle/.clang-format
../../../flutter/third_party/libcxxabi/src/demangle/README.txt
../../../flutter/third_party/libcxxabi/test
../../../flutter/third_party/libcxxabi/www
../../../flutter/third_party/libjpeg-turbo/src/.git
../../../flutter/third_party/libjpeg-turbo/src/.gitignore
../../../flutter/third_party/libjpeg-turbo/src/BUILDING.md
Expand Down Expand Up @@ -3509,43 +3544,5 @@
../../../fuchsia/sdk/linux/tools
../../../fuchsia/sdk/linux/version_history.json
../../../out
../../../third_party/android_embedding_dependencies
../../../third_party/gradle
../../../third_party/java
../../../third_party/libcxx/.clang-format
../../../third_party/libcxx/.clang-tidy
../../../third_party/libcxx/.git
../../../third_party/libcxx/.gitignore
../../../third_party/libcxx/CMakeLists.txt
../../../third_party/libcxx/CREDITS.TXT
../../../third_party/libcxx/TODO.TXT
../../../third_party/libcxx/appveyor-reqs-install.cmd
../../../third_party/libcxx/appveyor.yml
../../../third_party/libcxx/benchmarks
../../../third_party/libcxx/cmake
../../../third_party/libcxx/docs
../../../third_party/libcxx/include/CMakeLists.txt
../../../third_party/libcxx/include/version
../../../third_party/libcxx/lib/abi/CHANGELOG.TXT
../../../third_party/libcxx/lib/abi/CMakeLists.txt
../../../third_party/libcxx/lib/abi/README.TXT
../../../third_party/libcxx/src/CMakeLists.txt
../../../third_party/libcxx/src/ryu/README.txt
../../../third_party/libcxx/src/support/solaris
../../../third_party/libcxx/test
../../../third_party/libcxx/utils
../../../third_party/libcxxabi/.clang-format
../../../third_party/libcxxabi/.git
../../../third_party/libcxxabi/.gitignore
../../../third_party/libcxxabi/CMakeLists.txt
../../../third_party/libcxxabi/CREDITS.TXT
../../../third_party/libcxxabi/cmake
../../../third_party/libcxxabi/fuzz/CMakeLists.txt
../../../third_party/libcxxabi/include/CMakeLists.txt
../../../third_party/libcxxabi/src/CMakeLists.txt
../../../third_party/libcxxabi/src/demangle/.clang-format
../../../third_party/libcxxabi/src/demangle/README.txt
../../../third_party/libcxxabi/test
../../../third_party/libcxxabi/www
../../../third_party/web_dependencies/canvaskit
../../../third_party
../../../tools
Loading