Merge abseil_clients.gni into absl.gni.
No behavior change is expected, this CL only goal is to have one .gni
file in absl in order to maintain it more easily.
Bug: None
Change-Id: I2694a1689755395a855cca94c49152477e5017f2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2128077
Reviewed-by: Nico Weber <thakis@chromium.org>
Commit-Queue: Mirko Bonadei <mbonadei@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#754970}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 9511185c342bd24affb512ad9c2845fc938cbe4f
diff --git a/abseil_clients.gni b/abseil_clients.gni
deleted file mode 100644
index 6a2d1ff..0000000
--- a/abseil_clients.gni
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2019 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# Usage of Abseil in Chromium is guarded by an explicit opt-in list, before
-# adding projects to this list please reach out to cxx@chromium.org and CC:
-# - https://cs.chromium.org/chromium/src/third_party/abseil-cpp/OWNERS
-#
-# More information can be found at:
-# https://docs.google.com/document/d/1DgS1-A3rzboTLjpf4m1sqkJgWjnY_Ru2dokk1X1vBDU
-declare_args() {
- # Additional targets that can depend on absl.
- # ** DISCLAIMER **
- #
- # Using "additional_absl_clients" is highly discouraged because it will break
- # the component build since Abseil doesn't have export annotations and WebRTC
- # is already depending on it. Any CL that use "additional_absl_clients" will
- # have a really high probability of being reverted.
- additional_absl_clients = []
-}
-assert(!is_component_build || additional_absl_clients == [])
-
-_chromium_absl_clients = [
- "//libassistant/*",
- "//third_party/webrtc/*",
- "//third_party/abseil-cpp/*",
- "//third_party/googletest:gtest",
-]
-
-absl_visibility = _chromium_absl_clients + additional_absl_clients
diff --git a/absl.gni b/absl.gni
index 2efa844..1edf61a 100644
--- a/absl.gni
+++ b/absl.gni
@@ -8,7 +8,7 @@
# to correctly compile abseil in Chromium.
#
# Targets that set visibility should set it to something more restrictive than
-# absl_visibility (defined in //third_party/abseil-cpp/abseil_clients.gni).
+# `absl_visibility` (defined below).
#
# Usage:
# Most of the times its usage will be similar to the example below but all
@@ -21,7 +21,33 @@
# }
import("//build_overrides/build.gni")
-import("//third_party/abseil-cpp/abseil_clients.gni")
+
+# Usage of Abseil in Chromium is guarded by an explicit opt-in list, before
+# adding projects to this list please reach out to cxx@chromium.org and CC:
+# - https://cs.chromium.org/chromium/src/third_party/abseil-cpp/OWNERS
+#
+# More information can be found at:
+# https://docs.google.com/document/d/1DgS1-A3rzboTLjpf4m1sqkJgWjnY_Ru2dokk1X1vBDU
+declare_args() {
+ # Additional targets that can depend on absl.
+ # ** DISCLAIMER **
+ #
+ # Using "additional_absl_clients" is highly discouraged because it will break
+ # the component build since Abseil doesn't have export annotations and WebRTC
+ # is already depending on it. Any CL that use "additional_absl_clients" will
+ # have a really high probability of being reverted.
+ additional_absl_clients = []
+}
+assert(!is_component_build || additional_absl_clients == [])
+
+_chromium_absl_clients = [
+ "//libassistant/*",
+ "//third_party/webrtc/*",
+ "//third_party/abseil-cpp/*",
+ "//third_party/googletest:gtest",
+]
+
+absl_visibility = _chromium_absl_clients + additional_absl_clients
template("absl_source_set") {
source_set(target_name) {
diff --git a/absl/hash/BUILD.gn b/absl/hash/BUILD.gn
index 6a8d2e2..de413b4 100644
--- a/absl/hash/BUILD.gn
+++ b/absl/hash/BUILD.gn
@@ -3,7 +3,6 @@
# found in the LICENSE file.
import("//build_overrides/build.gni")
-import("//third_party/abseil-cpp/abseil_clients.gni")
import("//third_party/abseil-cpp/absl.gni")
# Usage of Abseil in Chromium is guarded by an explicit opt-in list, before
diff --git a/absl/strings/BUILD.gn b/absl/strings/BUILD.gn
index 05663e9..0bdfd67 100644
--- a/absl/strings/BUILD.gn
+++ b/absl/strings/BUILD.gn
@@ -3,7 +3,6 @@
# found in the LICENSE file.
import("//build_overrides/build.gni")
-import("//third_party/abseil-cpp/abseil_clients.gni")
import("//third_party/abseil-cpp/absl.gni")
# Usage of Abseil in Chromium is guarded by an explicit opt-in list, before
diff --git a/absl/types/BUILD.gn b/absl/types/BUILD.gn
index 7c97008..3afde6c 100644
--- a/absl/types/BUILD.gn
+++ b/absl/types/BUILD.gn
@@ -3,7 +3,6 @@
# found in the LICENSE file.
import("//build_overrides/build.gni")
-import("//third_party/abseil-cpp/abseil_clients.gni")
import("//third_party/abseil-cpp/absl.gni")
# Usage of Abseil in Chromium is guarded by an explicit opt-in list, before
