summaryrefslogtreecommitdiffstats
path: root/chrome/chrome.gyp
diff options
context:
space:
mode:
authorrogerta@google.com <rogerta@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-10 15:25:46 +0000
committerrogerta@google.com <rogerta@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-10 15:25:46 +0000
commit1c26217d647d823c1ce3355bc619e0ef7a68822b (patch)
treec2b9d8e34b8543ecaa5a6f3f6e4ead23d6b2ca34 /chrome/chrome.gyp
parentbcc528ed85d5fa3b4f327d2875d14de7c4506bd8 (diff)
downloadchromium_src-1c26217d647d823c1ce3355bc619e0ef7a68822b.zip
chromium_src-1c26217d647d823c1ce3355bc619e0ef7a68822b.tar.gz
chromium_src-1c26217d647d823c1ce3355bc619e0ef7a68822b.tar.bz2
Link with RLZ library from open source repo.
In order to pass the check dependency step in the build, I added rlz to the include_rules in DEPS. However, I am not sure this is the best solution. TEST=Make sure that the RLZ pings from chrome are the sameas they were with the old RLZ dll BUG=none Review URL: http://codereview.chromium.org/2755002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49399 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.gyp')
-rw-r--r--chrome/chrome.gyp2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 119aec9..267966f 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -1425,7 +1425,7 @@
'../breakpad/breakpad.gyp:*',
'../courgette/courgette.gyp:*',
'../gears/gears.gyp:*',
- # '../rlz/rlz.gyp:*', // temporary, back with open source rlz
+ '../rlz/rlz.gyp:*',
'../sandbox/sandbox.gyp:*',
'../tools/memory_watcher/memory_watcher.gyp:*',
'../v8/tools/gyp/v8.gyp:v8_shell',