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

Unified Diff: chrome/chrome_browser.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: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index a8de3538828b24f32cb8f2d2b29ce6cb4a2a554e..5d29f533d198d35adcf15215f0608ef55f0f77b4 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -4604,13 +4604,22 @@
},
],
}],
+ ['OS=="win" or OS=="mac"', {
+ 'dependencies': [
+ '../rlz/rlz.gyp:rlz_lib',
+ ],
+ }, { # 'OS!="win" and OS!="mac"
+ 'sources/': [
+ # Exclude all of rlz.
+ ['exclude', '^browser/rlz/'],
+ ],
+ }],
['OS=="win"', {
'include_dirs': [
'<(DEPTH)/third_party/wtl/include',
],
'dependencies': [
'../google_update/google_update.gyp:google_update',
- '../rlz/rlz.gyp:rlz_lib',
'../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
'../third_party/isimpledom/isimpledom.gyp:isimpledom',
'../ui/views/views.gyp:views',
@@ -4655,10 +4664,6 @@
# Exclude parts of password_manager.
['exclude', '^browser/password_manager/ie7_password\\.cc$'],
- # Exclude all of rlz.
- ['exclude', '^browser/rlz/'],
- ['exclude', '^browser/extensions/extension_rlz_module'],
-
# Exclude all of views.
['exclude', '^browser/ui/views/'],
@@ -4693,7 +4698,6 @@
# This exclude duplicates the one just above because of the
# order of evaluation of the 'sources/' rule above, the
# conditions, and this 'sources/' rule.
- ['exclude', '^browser/extensions/extension_rlz_module'],
['exclude', '^browser/google/google_update.cc'],
['exclude', '^browser/google/google_update.h'],
['exclude', '^browser/platform_util_common_linux.cc'],

Powered by Google App Engine
This is Rietveld 408576698