summaryrefslogtreecommitdiffstats
path: root/third_party
diff options
context:
space:
mode:
authornsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-31 01:11:29 +0000
committernsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-31 01:11:29 +0000
commit62ed19af190eade0137c8af80e30f71088a6ba0e (patch)
tree35ff2b61b9a8a4ae0c07bbbb30d1fcb05d364ff7 /third_party
parent704ebdcaf97137cf6bc86b28ccdf043f75e8622c (diff)
downloadchromium_src-62ed19af190eade0137c8af80e30f71088a6ba0e.zip
chromium_src-62ed19af190eade0137c8af80e30f71088a6ba0e.tar.gz
chromium_src-62ed19af190eade0137c8af80e30f71088a6ba0e.tar.bz2
Revert 73121 - Remove obsolete files from 'sources'. This causes needless work on incremental builds in VS2010.
This is breaking clobber builds with this error : e:\b\build\slave\google-chrome-rel-win\build\src\chrome_frame\iids.cc(6) : fatal error C1083: Cannot open include file: 'chrome_tab.h': No such file or directory BUG=71130 TEST=Check that Chrome builds. Review URL: http://codereview.chromium.org/6307018 TBR=jeanluc@chromium.org Review URL: http://codereview.chromium.org/6347032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73124 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
-rw-r--r--third_party/cacheinvalidation/cacheinvalidation.gyp4
-rw-r--r--third_party/libjingle/libjingle.gyp5
-rw-r--r--third_party/libxml/libxml.gyp4
-rw-r--r--third_party/protobuf/protobuf.gyp1
4 files changed, 10 insertions, 4 deletions
diff --git a/third_party/cacheinvalidation/cacheinvalidation.gyp b/third_party/cacheinvalidation/cacheinvalidation.gyp
index 8bff843..0f26cd3 100644
--- a/third_party/cacheinvalidation/cacheinvalidation.gyp
+++ b/third_party/cacheinvalidation/cacheinvalidation.gyp
@@ -81,8 +81,8 @@
'overrides/google/cacheinvalidation/mutex.h',
'overrides/google/cacheinvalidation/random.h',
'overrides/google/cacheinvalidation/scoped_ptr.h',
- 'overrides/google/cacheinvalidation/stl-namespace.h',
- 'overrides/google/cacheinvalidation/string_util.h',
+ 'overrides/google/cacheinvalidation/stl-namespace.h'
+ 'overrides/google/cacheinvalidation/string_util.h'
'overrides/google/cacheinvalidation/time.h',
'files/src/google/cacheinvalidation/invalidation-client-impl.cc',
'files/src/google/cacheinvalidation/invalidation-client-impl.h',
diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp
index 16b9d11..0c68ec6 100644
--- a/third_party/libjingle/libjingle.gyp
+++ b/third_party/libjingle/libjingle.gyp
@@ -150,6 +150,7 @@
'overrides/talk/xmllite/qname.cc',
'overrides/talk/xmllite/qname.h',
+ 'source/talk/base/DiskCacheStd.h',
'source/talk/base/Equifax_Secure_Global_eBusiness_CA-1.h',
'source/talk/base/asyncfile.cc',
'source/talk/base/asyncfile.h',
@@ -181,6 +182,7 @@
'source/talk/base/diskcache.h',
'source/talk/base/event.cc',
'source/talk/base/event.h',
+ 'source/talk/base/fakenetwork.h',
'source/talk/base/fileutils.cc',
'source/talk/base/fileutils.h',
'source/talk/base/fileutils_mock.h',
@@ -188,6 +190,7 @@
'source/talk/base/firewallsocketserver.h',
'source/talk/base/flags.cc',
'source/talk/base/flags.h',
+ 'source/talk/base/hash.h',
'source/talk/base/helpers.cc',
'source/talk/base/helpers.h',
'source/talk/base/host.cc',
@@ -210,6 +213,7 @@
'source/talk/base/messagehandler.h',
'source/talk/base/messagequeue.cc',
'source/talk/base/messagequeue.h',
+ 'source/talk/base/netfw.h',
'source/talk/base/nethelpers.cc',
'source/talk/base/nethelpers.h',
'source/talk/base/network.cc',
@@ -308,6 +312,7 @@
['OS=="win"', {
'sources': [
'overrides/talk/base/win32socketinit.cc',
+ 'source/talk/base/convert.h', # win32 only
'source/talk/base/schanneladapter.cc',
'source/talk/base/schanneladapter.h',
'source/talk/base/win32.h',
diff --git a/third_party/libxml/libxml.gyp b/third_party/libxml/libxml.gyp
index de0d329..6371628 100644
--- a/third_party/libxml/libxml.gyp
+++ b/third_party/libxml/libxml.gyp
@@ -94,6 +94,8 @@
'src/include/libxml/xpointer.h',
'src/include/win32config.h',
'src/include/wsockcompat.h',
+ 'src/win32/config.h',
+ 'src/win32/include/libxml/xmlversion.h',
'src/acconfig.h',
'src/c14n.c',
'src/catalog.c',
@@ -148,8 +150,6 @@
'src/xmlwriter.c',
'src/xpath.c',
'src/xpointer.c',
- 'win32/config.h',
- 'win32/include/libxml/xmlversion.h',
],
'defines': [
# Define LIBXML_STATIC as nothing to match how libxml.h
diff --git a/third_party/protobuf/protobuf.gyp b/third_party/protobuf/protobuf.gyp
index bafc344..6833ca5 100644
--- a/third_party/protobuf/protobuf.gyp
+++ b/third_party/protobuf/protobuf.gyp
@@ -112,6 +112,7 @@
'src/google/protobuf/text_format.h',
'src/google/protobuf/unknown_field_set.h',
'src/google/protobuf/wire_format.h',
+ 'src/google/protobuf/wire_format_inl.h',
'src/google/protobuf/io/gzip_stream.h',
'src/google/protobuf/io/printer.h',
'src/google/protobuf/io/tokenizer.h',