summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjeanluc@chromium.org <jeanluc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-04 23:01:53 +0000
committerjeanluc@chromium.org <jeanluc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-04 23:01:53 +0000
commitf09093853aa0f75f22b5d0d9b7dbe6767dd9f8fe (patch)
treef9cecb10e91eddd9aea3ccc78d60fdd437a9840f
parentd68070cb58aba4339fc1353fe23cd8afb7dd44dc (diff)
downloadchromium_src-f09093853aa0f75f22b5d0d9b7dbe6767dd9f8fe.zip
chromium_src-f09093853aa0f75f22b5d0d9b7dbe6767dd9f8fe.tar.gz
chromium_src-f09093853aa0f75f22b5d0d9b7dbe6767dd9f8fe.tar.bz2
Fix obsolete dependencies so that needless recompilation does not happen.
BUG=71130 Review URL: http://codereview.chromium.org/7545020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95527 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--base/allocator/allocator.gyp2
-rw-r--r--chrome/chrome_browser.gypi4
-rw-r--r--chrome/chrome_common.gypi1
-rw-r--r--chrome_frame/chrome_frame.gyp4
-rw-r--r--content/content_common.gypi1
-rw-r--r--skia/skia.gyp6
6 files changed, 7 insertions, 11 deletions
diff --git a/base/allocator/allocator.gyp b/base/allocator/allocator.gyp
index e6c134f..97490ea 100644
--- a/base/allocator/allocator.gyp
+++ b/base/allocator/allocator.gyp
@@ -81,7 +81,7 @@
'<(tcmalloc_dir)/src/base/spinlock_posix-inl.h',
'<(tcmalloc_dir)/src/base/spinlock_win32-inl.h',
'<(tcmalloc_dir)/src/base/stl_allocator.h',
- '<(tcmalloc_dir)/src/base/src/synchronization_profiling.h',
+ '<(tcmalloc_dir)/src/base/synchronization_profiling.h',
'<(tcmalloc_dir)/src/base/sysinfo.cc',
'<(tcmalloc_dir)/src/base/sysinfo.h',
'<(tcmalloc_dir)/src/base/thread_annotations.h',
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 8cface4..f2eabca 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -1187,7 +1187,7 @@
'browser/fullscreen_win.cc',
'browser/geolocation/access_token_store.cc',
'browser/geolocation/chrome_geolocation_permission_context.cc',
- 'browser/geolocation/chrome_geolocation_permission_contexth',
+ 'browser/geolocation/chrome_geolocation_permission_context.h',
'browser/geolocation/geolocation_content_settings_map.cc',
'browser/geolocation/geolocation_content_settings_map.h',
'browser/geolocation/geolocation_prefs.cc',
@@ -1794,7 +1794,7 @@
'browser/printing/print_preview_tab_controller.h',
'browser/printing/print_view_manager.cc',
'browser/printing/print_view_manager.h',
- 'browser/printing/print_view_manager_delegate.h',
+ 'browser/printing/print_view_manager_observer.h',
'browser/printing/printer_manager_dialog.h',
'browser/printing/printer_manager_dialog_linux.cc',
'browser/printing/printer_manager_dialog_mac.mm',
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index 9ae0e21..aaf249b 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -244,7 +244,6 @@
'common/thumbnail_score.h',
'common/url_constants.cc',
'common/url_constants.h',
- 'common/utility_messages.h',
'common/visitedlink_common.cc',
'common/visitedlink_common.h',
'common/web_apps.cc',
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp
index 50a7c08..2c42b87 100644
--- a/chrome_frame/chrome_frame.gyp
+++ b/chrome_frame/chrome_frame.gyp
@@ -712,8 +712,6 @@
'register_bho.rgs',
'stream_impl.cc',
'stream_impl.h',
- 'third_party/active_doc/in_place_menu.h',
- 'third_party/active_doc/ole_document_impl.h',
'urlmon_bind_status_callback.h',
'urlmon_bind_status_callback.cc',
'urlmon_moniker.h',
@@ -727,6 +725,8 @@
'utils.cc',
'vtable_patch_manager.cc',
'vtable_patch_manager.h',
+ '../third_party/active_doc/in_place_menu.h',
+ '../third_party/active_doc/ole_document_impl.h',
],
'include_dirs': [
'<(INTERMEDIATE_DIR)/../chrome_frame',
diff --git a/content/content_common.gypi b/content/content_common.gypi
index e4152d7..6781a95 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -164,7 +164,6 @@
'common/notification_service.h',
'common/notification_source.cc',
'common/notification_source.h',
- 'common/notification_type.h',
'common/p2p_messages.h',
'common/p2p_sockets.h',
'common/page_transition_types.cc',
diff --git a/skia/skia.gyp b/skia/skia.gyp
index 635a1f3..7799c8e 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -47,6 +47,7 @@
'../third_party/skia/gpu/src/GrRenderTarget.cpp',
'../third_party/skia/gpu/src/GrResource.cpp',
'../third_party/skia/gpu/src/GrResourceCache.cpp',
+ '../third_party/skia/gpu/src/GrResourceCache.h',
'../third_party/skia/gpu/src/GrStencil.cpp',
'../third_party/skia/gpu/src/GrTesselatedPathRenderer.cpp',
'../third_party/skia/gpu/src/GrTexture.cpp',
@@ -78,7 +79,6 @@
'../third_party/skia/gpu/include/GrInstanceCounter.h',
'../third_party/skia/gpu/include/GrKey.h',
'../third_party/skia/gpu/include/GrMatrix.h',
- '../third_party/skia/gpu/include/GrMemory.h',
'../third_party/skia/gpu/include/GrMesh.h',
'../third_party/skia/gpu/include/GrNoncopyable.h',
'../third_party/skia/gpu/include/GrPaint.h',
@@ -90,7 +90,6 @@
'../third_party/skia/gpu/include/GrRectanizer.h',
'../third_party/skia/gpu/include/GrRefCnt.h',
'../third_party/skia/gpu/include/GrRenderTarget.h',
- '../third_party/skia/gpu/include/GrResourceCache.h',
'../third_party/skia/gpu/include/GrSamplerState.h',
'../third_party/skia/gpu/include/GrScalar.h',
'../third_party/skia/gpu/include/GrStencil.h',
@@ -627,7 +626,6 @@
'../third_party/skia/include/gpu/SkGpuCanvas.h',
'../third_party/skia/include/gpu/SkGpuDevice.h',
- '../third_party/skia/include/gpu/SkGpuDeviceFactory.h',
'../third_party/skia/include/gpu/SkGr.h',
'../third_party/skia/include/gpu/SkGrTexturePixelRef.h',
@@ -958,7 +956,7 @@
'../third_party/skia/third_party/glu',
],
'sources': [
- '../third_party/skia/third_party/glu/internal_glu.h',
+ '../third_party/skia/third_party/glu/sk_glu.h',
'../third_party/skia/third_party/glu/gluos.h',
'../third_party/skia/third_party/glu/libtess/dict-list.h',
'../third_party/skia/third_party/glu/libtess/dict.c',