summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrogerta@google.com <rogerta@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-07 15:36:13 +0000
committerrogerta@google.com <rogerta@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-07 15:36:13 +0000
commit3f4b2c10471c1d4a8202ba63e27438accf9548e6 (patch)
tree247ca3608b9c3b69ee513f4b193c1182d8851597
parentd77b70e00fed345f2e1550c7528e7a8608dcb4cf (diff)
downloadchromium_src-3f4b2c10471c1d4a8202ba63e27438accf9548e6.zip
chromium_src-3f4b2c10471c1d4a8202ba63e27438accf9548e6.tar.gz
chromium_src-3f4b2c10471c1d4a8202ba63e27438accf9548e6.tar.bz2
Remove the old RLZ dll from the chrome code. There are no code dependencies
on this project; its only purpose is to copy the rlz.dll file to the correct spot in the output directory. This is the first step in getting the new open source RLZ library into chromium. A following CL will add the calls to new implementation. BUG=none TEST=none Review URL: http://codereview.chromium.org/2640003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49059 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--build/all.gyp2
-rw-r--r--chrome/chrome.gyp2
-rw-r--r--chrome/installer/mini_installer/chrome.release1
-rw-r--r--chrome/installer/mini_installer/chrome_frame.release1
-rw-r--r--rlz/rlz.gyp36
5 files changed, 2 insertions, 40 deletions
diff --git a/build/all.gyp b/build/all.gyp
index 175332b..bbb60b8 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -103,7 +103,7 @@
'../chrome_frame/chrome_frame.gyp:*',
'../courgette/courgette.gyp:*',
'../gears/gears.gyp:*',
- '../rlz/rlz.gyp:*',
+ # '../rlz/rlz.gyp:*', // temporary, back with open source rlz
'../sandbox/sandbox.gyp:*',
'../third_party/bsdiff/bsdiff.gyp:*',
'../third_party/bspatch/bspatch.gyp:*',
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 0b81f6e..a1800d3f 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -1416,7 +1416,7 @@
'../breakpad/breakpad.gyp:*',
'../courgette/courgette.gyp:*',
'../gears/gears.gyp:*',
- '../rlz/rlz.gyp:*',
+ # '../rlz/rlz.gyp:*', // temporary, back with open source rlz
'../sandbox/sandbox.gyp:*',
'../tools/memory_watcher/memory_watcher.gyp:*',
'../v8/tools/gyp/v8.gyp:v8_shell',
diff --git a/chrome/installer/mini_installer/chrome.release b/chrome/installer/mini_installer/chrome.release
index 80c0620..c243dca 100644
--- a/chrome/installer/mini_installer/chrome.release
+++ b/chrome/installer/mini_installer/chrome.release
@@ -58,5 +58,4 @@ Extensions\*.*: %(VersionDir)s\Extensions\
av*.dll: %(VersionDir)s\
[GOOGLE_CHROME]
-rlz.dll: %(VersionDir)s\
gcswf32.dll: %(VersionDir)s\
diff --git a/chrome/installer/mini_installer/chrome_frame.release b/chrome/installer/mini_installer/chrome_frame.release
index 567700f..6d15684 100644
--- a/chrome/installer/mini_installer/chrome_frame.release
+++ b/chrome/installer/mini_installer/chrome_frame.release
@@ -46,5 +46,4 @@ Extensions\*.*: %(VersionDir)s\Extensions\
av*.dll: %(VersionDir)s\
[GOOGLE_CHROME]
-rlz.dll: %(VersionDir)s\
gcswf32.dll: %(VersionDir)s\
diff --git a/rlz/rlz.gyp b/rlz/rlz.gyp
deleted file mode 100644
index d573753..0000000
--- a/rlz/rlz.gyp
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright (c) 2009 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-{
- 'conditions': [
- [ 'OS == "win"', {
- 'targets': [
- {
- 'target_name': 'rlz',
- 'type': 'none',
- 'msvs_guid': 'BF4F447B-72B5-4059-BE1B-F94337B1F385',
- 'conditions': [
- ['branding == "Chrome"', {
- 'copies': [
- {
- 'destination': '<(PRODUCT_DIR)',
- 'files': [
- 'binaries/rlz.dll',
- 'binaries/rlz_dll.pdb',
- ],
- },
- ],
- }],
- ],
- },
- ],
- }],
- ],
-}
-
-# Local Variables:
-# tab-width:2
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=2 shiftwidth=2: