Skip to content

Commit

Permalink
Remove dependency on abseil
Browse files Browse the repository at this point in the history
  • Loading branch information
zcbenz committed Dec 19, 2024
1 parent 48eee8d commit 19a1fe1
Show file tree
Hide file tree
Showing 12 changed files with 11 additions and 135 deletions.
6 changes: 0 additions & 6 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,6 @@
[submodule "third_party/libunwind/src"]
path = third_party/libunwind/src
url = https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind
[submodule "third_party/abseil-cpp"]
path = third_party/abseil-cpp
url = https://chromium.googlesource.com/chromium/src/third_party/abseil-cpp
[submodule "third_party/re2/src"]
path = third_party/re2/src
url = https://github.com/google/re2
[submodule "third_party/llvm-libc/src"]
path = third_party/llvm-libc/src
url = https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc
4 changes: 1 addition & 3 deletions scripts/create_dist.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ const files =
searchFiles('tools/cfi')).concat(
searchFiles('tools/clang/scripts')).concat(
searchFiles('tools/win')).concat(
searchFiles('third_party/abseil-cpp')).concat(
searchFiles('third_party/catapult')).concat(
searchFiles('third_party/depot_tools')).concat(
searchFiles('third_party/googletest')).concat(
Expand All @@ -47,8 +46,7 @@ const files =
searchFiles('third_party/libc++abi/src/include')).concat(
searchFiles('third_party/libunwind/src/src')).concat(
searchFiles('third_party/libunwind/src/include')).concat(
searchFiles('third_party/llvm-libc')).concat(
searchFiles('third_party/re2'))
searchFiles('third_party/llvm-libc'))
addFileToZip(gnzip, 'buildtools/deps_revisions.gni', '.')
for (let f of files) {
addFileToZip(gnzip, f, '.')
Expand Down
1 change: 0 additions & 1 deletion third_party/abseil-cpp
Submodule abseil-cpp deleted from 79b08c
15 changes: 9 additions & 6 deletions third_party/googletest/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ config("gtest_config") {
# Use Abseil, but without flags support: Abseil flags uses the
# `FastTypeId<T>()` pattern internally, which is known to be broken in
# subtle ways in the component build.
"GTEST_HAS_ABSL",
# PATCH(build-gn): No abseil.
# "GTEST_HAS_ABSL",
"GTEST_NO_ABSL_FLAGS",
]

Expand All @@ -47,8 +48,9 @@ config("gtest_config") {
}

configs = [
"//third_party/abseil-cpp:absl_include_config",
"//third_party/re2:re2_config",
# PATCH(build-gn): No abseil.
# "//third_party/abseil-cpp:absl_include_config",
# "//third_party/re2:re2_config",
]
}

Expand Down Expand Up @@ -134,8 +136,8 @@ source_set("gtest") {
defines = []

# googletest only needs `absl`, but this makes gn check happier.
deps = [ "//third_party/abseil-cpp:absl_full" ]
public_deps = [ "//third_party/re2" ]
# PATCH(build-gn): No abseil.
deps = []
if (is_nacl || !build_with_chromium) {
defines += [ "GTEST_DISABLE_PRINT_STACK_TRACE" ]
sources -= [
Expand Down Expand Up @@ -192,7 +194,8 @@ source_set("gmock") {
]

# googlemock only needs `absl`, but this makes gn check happier.
deps = [ "//third_party/abseil-cpp:absl_full" ]
# PATCH(build-gn): No abseil.
# deps = [ "//third_party/abseil-cpp:absl_full" ]

public_deps = [ ":gtest" ]
public_configs = [ ":gmock_config" ]
Expand Down
62 changes: 0 additions & 62 deletions third_party/re2/BUILD.gn

This file was deleted.

7 changes: 0 additions & 7 deletions third_party/re2/DEPS

This file was deleted.

6 changes: 0 additions & 6 deletions third_party/re2/DIR_METADATA

This file was deleted.

27 changes: 0 additions & 27 deletions third_party/re2/LICENSE

This file was deleted.

2 changes: 0 additions & 2 deletions third_party/re2/OWNERS

This file was deleted.

13 changes: 0 additions & 13 deletions third_party/re2/README.chromium

This file was deleted.

1 change: 0 additions & 1 deletion third_party/re2/src
Submodule src deleted from 6dcd83
2 changes: 1 addition & 1 deletion tools/gn
Submodule gn updated 1 files
+1 −3 src/gn/build_settings.cc

0 comments on commit 19a1fe1

Please sign in to comment.