Tweaks to make the use of chrome's net stack forceable through gyp.
Also whitelist usage of "net" and (for now) "content" for check_deps
BUG=none
TEST=none
TBR=rogerta
Review URL: https://codereview.appspot.com/5907059
git-svn-id: http://rlz.googlecode.com/svn/trunk@116 10bc0f33-e4bf-9a86-80cf-af638054f0c4
diff --git a/DEPS b/DEPS
index c2f5293..b07ba15 100644
--- a/DEPS
+++ b/DEPS
@@ -42,11 +42,16 @@
"src/tools/gyp":
"http://gyp.googlecode.com/svn/trunk@1233",
+
+ # If using rlz with chrome's networking library, add it and its dependencies
+ # here.
}
include_rules = [
"+base",
"+build",
+ "+content", # TODO: Remove this once http://crbug.com/118220 is fixed.
+ "+net", # This is only used when force_rlz_use_chrome_net=1 is passed to gyp.
]
hooks = [
diff --git a/rlz.gyp b/rlz.gyp
index fa8b4d8..8a92005 100644
--- a/rlz.gyp
+++ b/rlz.gyp
@@ -4,13 +4,16 @@
{
'variables': {
- # Set rlz_use_chrome_net to 1 to use chrome's network stack instead of
- # win inet.
+ 'variables': {
+ # Set force_rlz_use_chrome_net to 1 to use chrome's network stack instead
+ # of win inet.
+ 'force_rlz_use_chrome_net%': 0,
+ },
'conditions': [
- ['OS=="win"', {
- 'rlz_use_chrome_net%': 0,
- }, {
+ ['force_rlz_use_chrome_net or OS=="mac"', {
'rlz_use_chrome_net%': 1,
+ }, {
+ 'rlz_use_chrome_net%': 0,
}],
],
},
