1- # Copyright (c) 2018 The Chromium Authors. All rights reserved.
1+ # Copyright 2018 The Chromium Authors
22# Use of this source code is governed by a BSD-style license that can be
33# found in the LICENSE file.
44
@@ -61,6 +61,7 @@ group("absl_component_deps") {
6161 " //third_party/abseil-cpp/absl/base" ,
6262 " //third_party/abseil-cpp/absl/base:config" ,
6363 " //third_party/abseil-cpp/absl/base:core_headers" ,
64+ " //third_party/abseil-cpp/absl/base:prefetch" ,
6465 " //third_party/abseil-cpp/absl/cleanup" ,
6566 " //third_party/abseil-cpp/absl/container:btree" ,
6667 " //third_party/abseil-cpp/absl/container:fixed_array" ,
@@ -76,11 +77,15 @@ group("absl_component_deps") {
7677 " //third_party/abseil-cpp/absl/functional:bind_front" ,
7778 " //third_party/abseil-cpp/absl/functional:function_ref" ,
7879 " //third_party/abseil-cpp/absl/hash" ,
80+ " //third_party/abseil-cpp/absl/log:absl_check" ,
81+ " //third_party/abseil-cpp/absl/log:absl_log" ,
82+ " //third_party/abseil-cpp/absl/log:die_if_null" ,
7983 " //third_party/abseil-cpp/absl/memory" ,
8084 " //third_party/abseil-cpp/absl/meta:type_traits" ,
8185 " //third_party/abseil-cpp/absl/numeric:bits" ,
8286 " //third_party/abseil-cpp/absl/numeric:int128" ,
8387 " //third_party/abseil-cpp/absl/random" ,
88+ " //third_party/abseil-cpp/absl/random:distributions" ,
8489 " //third_party/abseil-cpp/absl/status" ,
8590 " //third_party/abseil-cpp/absl/status:statusor" ,
8691 " //third_party/abseil-cpp/absl/strings" ,
@@ -97,24 +102,13 @@ group("absl_component_deps") {
97102 # The following dependencies currently don't build with NaCl.
98103 # TODO(https://crbug.com/1114625): Fix build errors and remove this section.
99104 if (is_nacl ) {
100- public_deps -= [
101- " //third_party/abseil-cpp/absl/debugging:failure_signal_handler" ,
102- ]
105+ public_deps -=
106+ [ " //third_party/abseil-cpp/absl/debugging:failure_signal_handler" ]
103107 }
104108
105109 visibility = [ " :absl" ]
106110}
107111
108- group (" default" ) {
109- deps = [
110- " absl/types:any" ,
111- " absl/types:bad_any_cast" ,
112- " absl/types:bad_optional_access" ,
113- " absl/types:optional" ,
114- " absl/types:span" ,
115- ]
116- }
117-
118112config (" absl_include_config" ) {
119113 include_dirs = [ " ." ]
120114}
@@ -144,7 +138,6 @@ config("absl_default_cflags_cc") {
144138 " -Wnon-literal-null-conversion" ,
145139 " -Wnull-conversion" ,
146140 " -Wobjc-literal-conversion" ,
147- " -Wno-sign-conversion" ,
148141 " -Wstring-conversion" ,
149142 ]
150143 if (! is_nacl ) {
@@ -159,20 +152,33 @@ config("absl_test_cflags_cc") {
159152 cflags_cc += [
160153 " -Wno-conversion-null" ,
161154 " -Wno-missing-declarations" ,
162- " -Wno-sign-compare" ,
163155 " -Wno-unused-function" ,
164156 " -Wno-unused-parameter" ,
165157 " -Wno-unused-private-field" ,
166158 ]
167159 }
168160 if (is_win ) {
169161 cflags_cc += [
170- " /wd4018" , # signed/unsigned mismatch
171162 " /wd4101" , # unreferenced local variable
172163 ]
173164 }
174165}
175166
167+ config (" absl_test_config" ) {
168+ cflags_cc = []
169+ if (is_win && ! is_clang ) {
170+ cflags_cc += [ " /wd4996" ]
171+ }
172+ if (is_clang ) {
173+ cflags_cc += [
174+ " -Wno-deprecated-declarations" ,
175+ " -Wno-implicit-const-int-float-conversion" ,
176+ " -Wno-unused-private-field" ,
177+ " -Wno-unused-function" ,
178+ ]
179+ }
180+ }
181+
176182if (build_with_chromium ) {
177183 import (" //testing/test.gni" )
178184
@@ -185,14 +191,38 @@ if (build_with_chromium) {
185191 " absl/base:config_test" ,
186192 " absl/base:prefetch_test" ,
187193 " absl/cleanup:cleanup_test" ,
194+ # TODO(mbonadei ): Fix issue with EXPECT_DEATH and uncomment.
195+ # "absl/container:btree_test",
196+ " absl/container:common_policy_traits_test" ,
188197 " absl/container:inlined_vector_test" ,
189198 " absl/container:node_slot_policy_test" ,
190199 " absl/container:sample_element_size_test" ,
200+ " absl/crc:crc32c_test" ,
201+ " absl/crc:crc_cord_state_test" ,
202+ " absl/crc:crc_memcpy_test" ,
203+ " absl/crc:non_temporal_memcpy_test" ,
204+ " absl/debugging:stacktrace_test" ,
191205 " absl/functional:any_invocable_test" ,
206+ " absl/functional:function_ref_test" ,
192207 " absl/hash:hash_test" ,
193208 " absl/hash:low_level_hash_test" ,
209+ " absl/log:absl_check_test" ,
210+ " absl/log:absl_log_basic_test" ,
211+ " absl/log:die_if_null_test" ,
212+ " absl/log:flags_test" ,
213+ " absl/log:globals_test" ,
214+ " absl/log:log_entry_test" ,
215+ " absl/log:log_format_test" ,
216+ " absl/log:log_macro_hygiene_test" ,
217+ " absl/log:log_modifier_methods_test" ,
218+ " absl/log:log_sink_test" ,
219+ " absl/log:log_streamer_test" ,
220+ " absl/log:scoped_mock_log_test" ,
221+ " absl/log:stripping_test" ,
222+ " absl/log/internal:stderr_log_sink_test" ,
194223 " absl/memory:memory_test" ,
195224 " absl/meta:type_traits_test" ,
225+ " absl/numeric:int128_test" ,
196226 " absl/profiling:exponential_biased_test" ,
197227 " absl/profiling:periodic_sampler_test" ,
198228 " absl/status:statusor_test" ,
@@ -209,11 +239,16 @@ if (build_with_chromium) {
209239 " absl/strings:cordz_test" ,
210240 " absl/strings:cordz_update_scope_test" ,
211241 " absl/strings:cordz_update_tracker_test" ,
242+ " absl/strings:damerau_levenshtein_distance_test" ,
212243 " absl/strings:match_test" ,
213244 " absl/strings:str_replace_test" ,
214245 " absl/strings:string_view_test" ,
246+ " absl/synchronization:kernel_timeout_internal_test" ,
247+ " absl/synchronization:waiter_test" ,
248+ " absl/time:time_test" ,
215249 " absl/types:optional_test" ,
216250 " absl/types:variant_test" ,
251+ " absl/utility:if_constexpr_test" ,
217252 " //third_party/googletest:gtest_main" ,
218253 ]
219254 }
@@ -223,14 +258,8 @@ if (build_with_chromium) {
223258 testonly = true
224259 sources = [ " absl_hardening_test.cc" ]
225260 deps = [
261+ " :absl" ,
226262 " //base/test:run_all_unittests" ,
227- " //third_party/abseil-cpp/absl/base:config" ,
228- " //third_party/abseil-cpp/absl/container:fixed_array" ,
229- " //third_party/abseil-cpp/absl/container:inlined_vector" ,
230- " //third_party/abseil-cpp/absl/strings" ,
231- " //third_party/abseil-cpp/absl/types:optional" ,
232- " //third_party/abseil-cpp/absl/types:span" ,
233- " //third_party/abseil-cpp/absl/types:variant" ,
234263 " //third_party/googletest:gtest" ,
235264 ]
236265 }
0 commit comments