summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app/app_base.gypi1
-rw-r--r--base/base.gypi1
-rw-r--r--chrome/chrome_renderer.gypi2
-rw-r--r--gpu/gpu.gyp2
-rw-r--r--net/net.gyp2
-rw-r--r--remoting/remoting.gyp2
-rw-r--r--skia/skia.gyp9
-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
-rw-r--r--views/views.gyp1
-rw-r--r--webkit/glue/webkit_glue.gypi2
13 files changed, 10 insertions, 26 deletions
diff --git a/app/app_base.gypi b/app/app_base.gypi
index 156d6a5..2f0e6d0 100644
--- a/app/app_base.gypi
+++ b/app/app_base.gypi
@@ -206,7 +206,6 @@
'gfx/gl/gl_context_stub.cc',
'gfx/gl/gl_context_stub.h',
'gfx/gl/gl_context_win.cc',
- 'gfx/gl/gl_headers.h',
'gfx/gl/gl_implementation.cc',
'gfx/gl/gl_implementation.h',
'gfx/gl/gl_implementation_linux.cc',
diff --git a/base/base.gypi b/base/base.gypi
index 53ee010..aee11f5 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -98,7 +98,6 @@
'lazy_instance.h',
'linked_list.h',
'linked_ptr.h',
- 'lock.h',
'logging.cc',
'logging.h',
'logging_win.cc',
diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi
index e0f7c0c4..50f88d1 100644
--- a/chrome/chrome_renderer.gypi
+++ b/chrome/chrome_renderer.gypi
@@ -18,9 +18,9 @@
'../ppapi/ppapi.gyp:ppapi_proxy',
'../printing/printing.gyp:printing',
'../skia/skia.gyp:skia',
- '../third_party/hunspell/hunspell.gyp:hunspell',
'../third_party/cld/cld.gyp:cld',
'../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
+ '../third_party/hunspell/hunspell.gyp:hunspell',
'../third_party/icu/icu.gyp:icui18n',
'../third_party/icu/icu.gyp:icuuc',
'../third_party/npapi/npapi.gyp:npapi',
diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp
index dd22658..3a4805f 100644
--- a/gpu/gpu.gyp
+++ b/gpu/gpu.gyp
@@ -9,7 +9,7 @@
# with extra parameter checking. Once with no parameter checking to be 100%
# OpenGL ES 2.0 compliant for the conformance tests.
'gles2_c_lib_source_files': [
- 'command_buffer/client/gles2_c_lib.h',
+ 'command_buffer/client/gles2_lib.h',
'command_buffer/client/gles2_c_lib.cc',
'command_buffer/client/gles2_c_lib_autogen.h',
],
diff --git a/net/net.gyp b/net/net.gyp
index a181564..5ffda1b 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -66,7 +66,6 @@
'base/dnssec_chain_verifier.h',
'base/dnssec_keyset.cc',
'base/dnssec_keyset.h',
- 'base/dnssec_proto.h',
'base/dns_util.cc',
'base/dns_util.h',
'base/dnsrr_resolver.cc',
@@ -873,7 +872,6 @@
'base/host_mapping_rules_unittest.cc',
'base/host_resolver_impl_unittest.cc',
'base/keygen_handler_unittest.cc',
- 'base/leak_annotations.h',
'base/listen_socket_unittest.cc',
'base/listen_socket_unittest.h',
'base/mapped_host_resolver_unittest.cc',
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index 0f0ce91..b297172 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -371,10 +371,8 @@
'protocol/connection_to_client.h',
'protocol/connection_to_host.cc',
'protocol/connection_to_host.h',
- 'protocol/host_control_message_handler.h',
'protocol/host_control_sender.cc',
'protocol/host_control_sender.h',
- 'protocol/host_event_message_handler.h',
'protocol/host_message_dispatcher.cc',
'protocol/host_message_dispatcher.h',
'protocol/host_stub.h',
diff --git a/skia/skia.gyp b/skia/skia.gyp
index ff6b8e8..b486647 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -269,7 +269,6 @@
'../third_party/skia/src/core/SkBitmapShaderTemplate.h',
'../third_party/skia/src/core/SkBitmap_scroll.cpp',
'../third_party/skia/src/core/SkBlitBWMaskTemplate.h',
- '../third_party/skia/src/core/SkBlitRow.h',
'../third_party/skia/src/core/SkBlitRow_D16.cpp',
'../third_party/skia/src/core/SkBlitRow_D32.cpp',
'../third_party/skia/src/core/SkBlitRow_D4444.cpp',
@@ -372,6 +371,7 @@
'../third_party/skia/src/core/SkStroke.cpp',
'../third_party/skia/src/core/SkStrokerPriv.cpp',
'../third_party/skia/src/core/SkStrokerPriv.h',
+ '../third_party/skia/src/core/SkTextFormatParams.h',
'../third_party/skia/src/core/SkTSearch.cpp',
'../third_party/skia/src/core/SkTSort.h',
'../third_party/skia/src/core/SkTemplatesPriv.h',
@@ -477,12 +477,12 @@
'../third_party/skia/src/ports/sk_predefined_gamma.h',
'../third_party/skia/src/include/utils/mac/SkCGUtils.h',
- '../third_party/skia/src/include/utils/SkTextFormatParams.h',
'../third_party/skia/src/utils/mac/SkCreateCGImageRef.cpp',
'../third_party/skia/include/core/Sk64.h',
'../third_party/skia/include/core/SkAutoKern.h',
'../third_party/skia/include/core/SkBitmap.h',
+ '../third_party/skia/include/core/SkBlitRow.h',
'../third_party/skia/include/core/SkBlitter.h',
'../third_party/skia/include/core/SkBounder.h',
'../third_party/skia/include/core/SkBuffer.h',
@@ -500,7 +500,7 @@
'../third_party/skia/include/core/SkDraw.h',
'../third_party/skia/include/core/SkDrawFilter.h',
'../third_party/skia/include/core/SkDrawLooper.h',
- '../third_party/skia/include/core/SkDrawing.h',
+ #'../third_party/skia/include/core/SkDrawing.h',
'../third_party/skia/include/core/SkEndian.h',
'../third_party/skia/include/core/SkFDot6.h',
'../third_party/skia/include/core/SkFixed.h',
@@ -528,7 +528,6 @@
'../third_party/skia/include/core/SkPicture.h',
'../third_party/skia/include/core/SkPixelRef.h',
'../third_party/skia/include/core/SkPoint.h',
- '../third_party/skia/include/core/SkPorterDuff.h',
'../third_party/skia/include/core/SkPtrRecorder.h',
'../third_party/skia/include/core/SkRandom.h',
'../third_party/skia/include/core/SkRasterizer.h',
@@ -579,9 +578,9 @@
'../third_party/skia/include/effects/SkKernel33MaskFilter.h',
'../third_party/skia/include/effects/SkLayerDrawLooper.h',
'../third_party/skia/include/effects/SkLayerRasterizer.h',
- '../third_party/skia/include/effects/SkNWayCanvas.h',
'../third_party/skia/include/effects/SkPaintFlagsDrawFilter.h',
'../third_party/skia/include/effects/SkPixelXorXfermode.h',
+ '../third_party/skia/include/effects/SkPorterDuff.h',
'../third_party/skia/include/effects/SkTransparentShader.h',
'../third_party/skia/include/gpu/SkGpuCanvas.h',
diff --git a/third_party/cacheinvalidation/cacheinvalidation.gyp b/third_party/cacheinvalidation/cacheinvalidation.gyp
index 0f26cd3..8bff843 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 0c68ec6..16b9d11 100644
--- a/third_party/libjingle/libjingle.gyp
+++ b/third_party/libjingle/libjingle.gyp
@@ -150,7 +150,6 @@
'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',
@@ -182,7 +181,6 @@
'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',
@@ -190,7 +188,6 @@
'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',
@@ -213,7 +210,6 @@
'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',
@@ -312,7 +308,6 @@
['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 6371628..de0d329 100644
--- a/third_party/libxml/libxml.gyp
+++ b/third_party/libxml/libxml.gyp
@@ -94,8 +94,6 @@
'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',
@@ -150,6 +148,8 @@
'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 6833ca5..bafc344 100644
--- a/third_party/protobuf/protobuf.gyp
+++ b/third_party/protobuf/protobuf.gyp
@@ -112,7 +112,6 @@
'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',
diff --git a/views/views.gyp b/views/views.gyp
index ca7c6ff..e38cde8 100644
--- a/views/views.gyp
+++ b/views/views.gyp
@@ -154,7 +154,6 @@
'controls/menu/menu_separator_gtk.cc',
'controls/menu/menu_separator_gtk.h',
'controls/menu/menu_separator_win.cc',
- 'controls/menu/menu_separator_win.h',
'controls/menu/menu_win.cc',
'controls/menu/menu_win.h',
'controls/menu/menu_wrapper.h',
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
index eec99bf..2de3fbc 100644
--- a/webkit/glue/webkit_glue.gypi
+++ b/webkit/glue/webkit_glue.gypi
@@ -192,7 +192,6 @@
'../plugins/npapi/gtk_plugin_container_manager.h',
'../plugins/npapi/npapi_extension_thunk.cc',
'../plugins/npapi/npapi_extension_thunk.h',
- '../plugins/npapi/nphostapi.h',
'../plugins/npapi/plugin_constants_win.cc',
'../plugins/npapi/plugin_constants_win.h',
'../plugins/npapi/plugin_group.cc',
@@ -222,7 +221,6 @@
'../plugins/npapi/plugin_string_stream.h',
'../plugins/npapi/plugin_web_event_converter_mac.h',
'../plugins/npapi/plugin_web_event_converter_mac.mm',
- '../plugins/npapi/ppb_private.h',
'../plugins/npapi/quickdraw_drawing_manager_mac.cc',
'../plugins/npapi/quickdraw_drawing_manager_mac.h',
'../plugins/npapi/webplugin.cc',
generated by cgit v1.1 at 2025-02-10 16:52:04 +0000