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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/common.gypi ('k') | build/config/compiler/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/BUILD.gn
diff --git a/build/config/BUILD.gn b/build/config/BUILD.gn
index 2427b72afd920cf6b85a48d83f42a19fe5184bd4..5cf18403e948e8e55c93144f62659a5d5e6ac163 100644
--- a/build/config/BUILD.gn
+++ b/build/config/BUILD.gn
@@ -239,6 +239,9 @@ config("feature_flags") {
defines += [ "MOBILE_SAFE_BROWSING" ]
defines += [ "SAFE_BROWSING_SERVICE" ]
}
+ if (is_official_build) {
+ defines += [ "OFFICIAL_BUILD" ]
Dirk Pranke 2015/05/12 00:09:41 Didn't you have this in a different CL somewhere?
+ }
}
# Debug/release ----------------------------------------------------------------
@@ -271,6 +274,18 @@ config("debug") {
config("release") {
defines = [ "NDEBUG" ]
+
+ # Sanitizers.
+ # TODO(GYP) The GYP build has "release_valgrind_build == 0" for this
+ # condition. When Valgrind is set up, we need to do the same here.
+ if (!is_tsan) {
+ defines += [ "NVALGRIND" ]
+ if (!is_nacl) {
+ # NaCl always enables dynamic annotations. Currently this value is set to
+ # 1 for all .nexes.
+ defines += [ "DYNAMIC_ANNOTATIONS_ENABLED=0" ]
Dirk Pranke 2015/05/12 00:09:40 I don't quite understand this comment; how is the
+ }
+ }
}
# Default libraries ------------------------------------------------------------
« 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