summaryrefslogtreecommitdiffstats
path: root/chrome_elf/blacklist.gypi
diff options
context:
space:
mode:
authorcsharp@chromium.org <csharp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-13 16:57:04 +0000
committercsharp@chromium.org <csharp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-13 16:57:04 +0000
commita461f916f4fb8a70a1b8ae0a91d2ba02f9af2f73 (patch)
tree43c1a568f5414ea89cc3e2c244c898cac1ba49fd /chrome_elf/blacklist.gypi
parent045aed8905fa83c4adefb30797d6a82bce61f42d (diff)
downloadchromium_src-a461f916f4fb8a70a1b8ae0a91d2ba02f9af2f73.zip
chromium_src-a461f916f4fb8a70a1b8ae0a91d2ba02f9af2f73.tar.gz
chromium_src-a461f916f4fb8a70a1b8ae0a91d2ba02f9af2f73.tar.bz2
Use a Finch Experiment to control the Browser Blacklist
Also increase the states stored in the register to prevent the setup code from running multiple times per version if it fails to start one time. Also, this uses RegQueryValueEx and RegSetValueEx instead of RegSetKeyValue and RegGetValue since they aren't available on XP. TBR=sky@chromium.org BUG=329023 Review URL: https://codereview.chromium.org/133923002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244517 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_elf/blacklist.gypi')
-rw-r--r--chrome_elf/blacklist.gypi6
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome_elf/blacklist.gypi b/chrome_elf/blacklist.gypi
index ab5597d..2db4941 100644
--- a/chrome_elf/blacklist.gypi
+++ b/chrome_elf/blacklist.gypi
@@ -6,6 +6,9 @@
{
'target_name': 'blacklist',
'type': 'static_library',
+ 'include_dirs': [
+ '<(SHARED_INTERMEDIATE_DIR)',
+ ],
'sources': [
'blacklist/blacklist.cc',
'blacklist/blacklist.h',
@@ -17,7 +20,8 @@
# as that would risk pulling in base's link-time dependencies which
# chrome_elf cannot do.
'../base/base.gyp:base_static',
- '../sandbox/sandbox.gyp:sandbox',
+ '../chrome/chrome.gyp:chrome_version_header',
+ '../sandbox/sandbox.gyp:sandbox',
],
},
{