Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8)

Side by Side Diff: build/config/BUILD.gn

Issue 1129293003: Sync defines with the GYP build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « build/common.gypi ('k') | build/config/compiler/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//build/config/allocator.gni") 5 import("//build/config/allocator.gni")
6 import("//build/config/chrome_build.gni") 6 import("//build/config/chrome_build.gni")
7 import("//build/config/crypto.gni") 7 import("//build/config/crypto.gni")
8 import("//build/config/features.gni") 8 import("//build/config/features.gni")
9 import("//build/config/ui.gni") 9 import("//build/config/ui.gni")
10 import("//build/module_args/v8.gni") 10 import("//build/module_args/v8.gni")
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 } 232 }
233 if (safe_browsing_mode == 1) { 233 if (safe_browsing_mode == 1) {
234 defines += [ "FULL_SAFE_BROWSING" ] 234 defines += [ "FULL_SAFE_BROWSING" ]
235 defines += [ "SAFE_BROWSING_CSD" ] 235 defines += [ "SAFE_BROWSING_CSD" ]
236 defines += [ "SAFE_BROWSING_DB_LOCAL" ] 236 defines += [ "SAFE_BROWSING_DB_LOCAL" ]
237 defines += [ "SAFE_BROWSING_SERVICE" ] 237 defines += [ "SAFE_BROWSING_SERVICE" ]
238 } else if (safe_browsing_mode == 2) { 238 } else if (safe_browsing_mode == 2) {
239 defines += [ "MOBILE_SAFE_BROWSING" ] 239 defines += [ "MOBILE_SAFE_BROWSING" ]
240 defines += [ "SAFE_BROWSING_SERVICE" ] 240 defines += [ "SAFE_BROWSING_SERVICE" ]
241 } 241 }
242 if (is_official_build) {
243 defines += [ "OFFICIAL_BUILD" ]
Dirk Pranke 2015/05/12 00:09:41 Didn't you have this in a different CL somewhere?
244 }
242 } 245 }
243 246
244 # Debug/release ---------------------------------------------------------------- 247 # Debug/release ----------------------------------------------------------------
245 248
246 config("debug") { 249 config("debug") {
247 defines = [ 250 defines = [
248 "_DEBUG", 251 "_DEBUG",
249 "DYNAMIC_ANNOTATIONS_ENABLED=1", 252 "DYNAMIC_ANNOTATIONS_ENABLED=1",
250 "WTF_USE_DYNAMIC_ANNOTATIONS=1", 253 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
251 ] 254 ]
(...skipping 12 matching lines...) Expand all
264 !disable_iterator_debugging) { 267 !disable_iterator_debugging) {
265 # Enable libstdc++ debugging facilities to help catch problems early, see 268 # Enable libstdc++ debugging facilities to help catch problems early, see
266 # http://crbug.com/65151 . 269 # http://crbug.com/65151 .
267 # TODO(phajdan.jr): Should we enable this for all of POSIX? 270 # TODO(phajdan.jr): Should we enable this for all of POSIX?
268 defines += [ "_GLIBCXX_DEBUG=1" ] 271 defines += [ "_GLIBCXX_DEBUG=1" ]
269 } 272 }
270 } 273 }
271 274
272 config("release") { 275 config("release") {
273 defines = [ "NDEBUG" ] 276 defines = [ "NDEBUG" ]
277
278 # Sanitizers.
279 # TODO(GYP) The GYP build has "release_valgrind_build == 0" for this
280 # condition. When Valgrind is set up, we need to do the same here.
281 if (!is_tsan) {
282 defines += [ "NVALGRIND" ]
283 if (!is_nacl) {
284 # NaCl always enables dynamic annotations. Currently this value is set to
285 # 1 for all .nexes.
286 defines += [ "DYNAMIC_ANNOTATIONS_ENABLED=0" ]
Dirk Pranke 2015/05/12 00:09:40 I don't quite understand this comment; how is the
287 }
288 }
274 } 289 }
275 290
276 # Default libraries ------------------------------------------------------------ 291 # Default libraries ------------------------------------------------------------
277 292
278 # This config defines the default libraries applied to all targets. 293 # This config defines the default libraries applied to all targets.
279 config("default_libs") { 294 config("default_libs") {
280 if (is_win) { 295 if (is_win) {
281 # TODO(brettw) this list of defaults should probably be smaller, and 296 # TODO(brettw) this list of defaults should probably be smaller, and
282 # instead the targets that use the less common ones (e.g. wininet or 297 # instead the targets that use the less common ones (e.g. wininet or
283 # winspool) should include those explicitly. 298 # winspool) should include those explicitly.
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
339 "CoreFoundation.framework", 354 "CoreFoundation.framework",
340 "CoreGraphics.framework", 355 "CoreGraphics.framework",
341 "CoreText.framework", 356 "CoreText.framework",
342 "Foundation.framework", 357 "Foundation.framework",
343 "UIKit.framework", 358 "UIKit.framework",
344 ] 359 ]
345 } else if (is_linux) { 360 } else if (is_linux) {
346 libs = [ "dl" ] 361 libs = [ "dl" ]
347 } 362 }
348 } 363 }
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | build/config/compiler/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698