summaryrefslogtreecommitdiffstats
path: root/third_party
diff options
context:
space:
mode:
authorajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-26 22:05:05 +0000
committerajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-26 22:05:05 +0000
commitfe60195a19a160fa09f76aab21f355e63caa4faa (patch)
tree0d7157d0fc8198d799e35a059572d727bebce2ea /third_party
parentf191d1bd7601d9be5aea71b1890a85d6e16707dc (diff)
downloadchromium_src-fe60195a19a160fa09f76aab21f355e63caa4faa.zip
chromium_src-fe60195a19a160fa09f76aab21f355e63caa4faa.tar.gz
chromium_src-fe60195a19a160fa09f76aab21f355e63caa4faa.tar.bz2
Revert "Checkin a version of gmock, modified to use our boost_tuple in VS2005."
This reverts commit 071e95bcdcefcd2cb86c9aed5cb073bbcaa7f2a7. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16931 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
-rw-r--r--third_party/boost/boost.gyp4
1 files changed, 3 insertions, 1 deletions
diff --git a/third_party/boost/boost.gyp b/third_party/boost/boost.gyp
index 5239a7f..e1b5be1 100644
--- a/third_party/boost/boost.gyp
+++ b/third_party/boost/boost.gyp
@@ -413,7 +413,9 @@
],
'direct_dependent_settings': {
'include_dirs': [
- 'boost_1_36_0',
+# TODO(ajwong): Enable with the gmock checkin.
+# 'boost_1_36_0/boost/tr1/tr1',
+# 'boost_1_36_0',
],
},
}