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

Unified Diff: build/common.gypi

Issue 9699054: rlz: Hook up on mac, switch to chrome's network stack on win. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 9 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
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index c90d15bb9bae08d61d7e26631751e6588b31f27c..73b681973523f96445333da3160aa88cbd9b0163 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -282,6 +282,9 @@
# GYP_DEFINES.
'tests_run%': 'check',
+ # Force rlz to use chrome's networking stack.
+ 'force_rlz_use_chrome_net%': 1,
+
'conditions': [
# TODO(epoger): Figure out how to set use_skia=1 for Mac outside of
# the 'conditions' clause. Initial attempts resulted in chromium and
@@ -500,6 +503,7 @@
'use_canvas_skia%': '<(use_canvas_skia)',
'tests_run%': '<(tests_run)',
'enable_automation%': '<(enable_automation)',
+ 'force_rlz_use_chrome_net%': '<(force_rlz_use_chrome_net)',
# Whether to build for Wayland display server
'use_wayland%': 0,
@@ -1139,6 +1143,9 @@
}, { # else: branding!="Chrome"
'defines': ['CHROMIUM_BUILD'],
}],
+ ['branding=="Chrome" and (OS=="win" or OS=="mac")', {
+ 'defines': ['ENABLE_RLZ'],
+ }],
['component=="shared_library"', {
'defines': ['COMPONENT_BUILD'],
}],
« no previous file with comments | « DEPS ('k') | chrome/browser/browser_shutdown.cc » ('j') | chrome/browser/rlz/rlz.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698