Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit f9e33d9

Browse files
Move libcxx to //flutter/third_party (#52773)
Fixes flutter/flutter#144202
1 parent 070ab2e commit f9e33d9

File tree

12 files changed

+2164
-2191
lines changed

12 files changed

+2164
-2191
lines changed

DEPS

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ allowed_hosts = [
277277
]
278278

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

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

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

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

297297
'src/flutter/third_party/glfw':

build/secondary/third_party/libcxx/BUILD.gn renamed to build/secondary/flutter/third_party/libcxx/BUILD.gn

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
config("libcxx_config") {
66
defines = [ "_LIBCPP_DISABLE_AVAILABILITY=1" ]
7-
include_dirs = [ "//flutter/build/secondary/third_party/libcxx/config" ]
7+
include_dirs = [ "//flutter/build/secondary/flutter/third_party/libcxx/config" ]
88
}
99

1010
config("src_include") {
@@ -56,7 +56,7 @@ source_set("libcxx") {
5656
"src/vector.cpp",
5757
]
5858

59-
deps = [ "//third_party/libcxxabi" ]
59+
deps = [ "//flutter/third_party/libcxxabi" ]
6060

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

6767
public_configs = [
6868
":libcxx_config",
69-
"//third_party/libcxxabi:libcxxabi_config",
69+
"//flutter/third_party/libcxxabi:libcxxabi_config",
7070
]
7171

7272
defines = [
@@ -101,11 +101,11 @@ source_set("libcxx_nolto") {
101101

102102
cflags_cc = [ "-fno-lto" ]
103103

104-
deps = [ "//third_party/libcxxabi" ]
104+
deps = [ "//flutter/third_party/libcxxabi" ]
105105

106106
public_configs = [
107107
":libcxx_config",
108-
"//third_party/libcxxabi:libcxxabi_config",
108+
"//flutter/third_party/libcxxabi:libcxxabi_config",
109109
]
110110

111111
defines = [

build/secondary/third_party/libcxxabi/BUILD.gn renamed to build/secondary/flutter/third_party/libcxxabi/BUILD.gn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ source_set("libcxxabi") {
3838
configs -= [ "//build/config/compiler:cxx_version_default" ]
3939
configs += [ "//build/config/compiler:cxx_version_20" ]
4040

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

4343
# No translation units in the engine are built with exceptions. But, using
4444
# Objective-C exceptions requires some infrastructure setup for exceptions.

ci/licenses.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ function verify_licenses() (
174174

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

179179
if [[ $actualLicenseCount -ne $expectedLicenseCount ]]; then
180180
echo "=============================== ERROR ==============================="

ci/licenses_golden/excluded_files

Lines changed: 36 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -2093,6 +2093,41 @@
20932093
../../../flutter/third_party/json/tools/serve_header/README.md
20942094
../../../flutter/third_party/json/tools/serve_header/requirements.txt
20952095
../../../flutter/third_party/json/tools/serve_header/serve_header.py
2096+
../../../flutter/third_party/libcxx/.clang-format
2097+
../../../flutter/third_party/libcxx/.clang-tidy
2098+
../../../flutter/third_party/libcxx/.git
2099+
../../../flutter/third_party/libcxx/.gitignore
2100+
../../../flutter/third_party/libcxx/CMakeLists.txt
2101+
../../../flutter/third_party/libcxx/CREDITS.TXT
2102+
../../../flutter/third_party/libcxx/TODO.TXT
2103+
../../../flutter/third_party/libcxx/appveyor-reqs-install.cmd
2104+
../../../flutter/third_party/libcxx/appveyor.yml
2105+
../../../flutter/third_party/libcxx/benchmarks
2106+
../../../flutter/third_party/libcxx/cmake
2107+
../../../flutter/third_party/libcxx/docs
2108+
../../../flutter/third_party/libcxx/include/CMakeLists.txt
2109+
../../../flutter/third_party/libcxx/include/version
2110+
../../../flutter/third_party/libcxx/lib/abi/CHANGELOG.TXT
2111+
../../../flutter/third_party/libcxx/lib/abi/CMakeLists.txt
2112+
../../../flutter/third_party/libcxx/lib/abi/README.TXT
2113+
../../../flutter/third_party/libcxx/src/CMakeLists.txt
2114+
../../../flutter/third_party/libcxx/src/ryu/README.txt
2115+
../../../flutter/third_party/libcxx/src/support/solaris
2116+
../../../flutter/third_party/libcxx/test
2117+
../../../flutter/third_party/libcxx/utils
2118+
../../../flutter/third_party/libcxxabi/.clang-format
2119+
../../../flutter/third_party/libcxxabi/.git
2120+
../../../flutter/third_party/libcxxabi/.gitignore
2121+
../../../flutter/third_party/libcxxabi/CMakeLists.txt
2122+
../../../flutter/third_party/libcxxabi/CREDITS.TXT
2123+
../../../flutter/third_party/libcxxabi/cmake
2124+
../../../flutter/third_party/libcxxabi/fuzz/CMakeLists.txt
2125+
../../../flutter/third_party/libcxxabi/include/CMakeLists.txt
2126+
../../../flutter/third_party/libcxxabi/src/CMakeLists.txt
2127+
../../../flutter/third_party/libcxxabi/src/demangle/.clang-format
2128+
../../../flutter/third_party/libcxxabi/src/demangle/README.txt
2129+
../../../flutter/third_party/libcxxabi/test
2130+
../../../flutter/third_party/libcxxabi/www
20962131
../../../flutter/third_party/libjpeg-turbo/src/.git
20972132
../../../flutter/third_party/libjpeg-turbo/src/.gitignore
20982133
../../../flutter/third_party/libjpeg-turbo/src/BUILDING.md
@@ -3509,43 +3544,5 @@
35093544
../../../fuchsia/sdk/linux/tools
35103545
../../../fuchsia/sdk/linux/version_history.json
35113546
../../../out
3512-
../../../third_party/android_embedding_dependencies
3513-
../../../third_party/gradle
3514-
../../../third_party/java
3515-
../../../third_party/libcxx/.clang-format
3516-
../../../third_party/libcxx/.clang-tidy
3517-
../../../third_party/libcxx/.git
3518-
../../../third_party/libcxx/.gitignore
3519-
../../../third_party/libcxx/CMakeLists.txt
3520-
../../../third_party/libcxx/CREDITS.TXT
3521-
../../../third_party/libcxx/TODO.TXT
3522-
../../../third_party/libcxx/appveyor-reqs-install.cmd
3523-
../../../third_party/libcxx/appveyor.yml
3524-
../../../third_party/libcxx/benchmarks
3525-
../../../third_party/libcxx/cmake
3526-
../../../third_party/libcxx/docs
3527-
../../../third_party/libcxx/include/CMakeLists.txt
3528-
../../../third_party/libcxx/include/version
3529-
../../../third_party/libcxx/lib/abi/CHANGELOG.TXT
3530-
../../../third_party/libcxx/lib/abi/CMakeLists.txt
3531-
../../../third_party/libcxx/lib/abi/README.TXT
3532-
../../../third_party/libcxx/src/CMakeLists.txt
3533-
../../../third_party/libcxx/src/ryu/README.txt
3534-
../../../third_party/libcxx/src/support/solaris
3535-
../../../third_party/libcxx/test
3536-
../../../third_party/libcxx/utils
3537-
../../../third_party/libcxxabi/.clang-format
3538-
../../../third_party/libcxxabi/.git
3539-
../../../third_party/libcxxabi/.gitignore
3540-
../../../third_party/libcxxabi/CMakeLists.txt
3541-
../../../third_party/libcxxabi/CREDITS.TXT
3542-
../../../third_party/libcxxabi/cmake
3543-
../../../third_party/libcxxabi/fuzz/CMakeLists.txt
3544-
../../../third_party/libcxxabi/include/CMakeLists.txt
3545-
../../../third_party/libcxxabi/src/CMakeLists.txt
3546-
../../../third_party/libcxxabi/src/demangle/.clang-format
3547-
../../../third_party/libcxxabi/src/demangle/README.txt
3548-
../../../third_party/libcxxabi/test
3549-
../../../third_party/libcxxabi/www
3550-
../../../third_party/web_dependencies/canvaskit
3547+
../../../third_party
35513548
../../../tools

0 commit comments

Comments
 (0)