diff options
| -rw-r--r-- | base/allocator/allocator.gyp | 1 | ||||
| -rw-r--r-- | chrome/chrome_tests.gypi | 1 | ||||
| -rw-r--r-- | chrome_frame/chrome_frame.gyp | 22 | ||||
| -rw-r--r-- | chrome_frame/chrome_frame_launcher.gyp | 2 | ||||
| -rw-r--r-- | ppapi/ppapi_tests.gypi | 1 | ||||
| -rw-r--r-- | third_party/libjingle/libjingle.gyp | 2 | ||||
| -rw-r--r-- | views/views.gyp | 2 |
7 files changed, 12 insertions, 19 deletions
diff --git a/base/allocator/allocator.gyp b/base/allocator/allocator.gyp index 87b4127..9eb96de 100644 --- a/base/allocator/allocator.gyp +++ b/base/allocator/allocator.gyp @@ -133,7 +133,6 @@ '<(tcmalloc_dir)/src/stack_trace_table.cc', '<(tcmalloc_dir)/src/stack_trace_table.h', '<(tcmalloc_dir)/src/stacktrace.cc', - '<(tcmalloc_dir)/src/stacktrace.h', '<(tcmalloc_dir)/src/stacktrace_config.h', '<(tcmalloc_dir)/src/stacktrace_generic-inl.h', '<(tcmalloc_dir)/src/stacktrace_libunwind-inl.h', diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 4d8f57d..f1620a0 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -57,7 +57,6 @@ # The only thing used from browser is Browser::Type. 'browser/extensions/test_extension_prefs.cc', 'browser/extensions/test_extension_prefs.h', - 'browser/geolocation/arbitrator_dependency_factories_for_tests.h', 'browser/geolocation/mock_location_provider.cc', 'browser/geolocation/mock_location_provider.h', 'browser/mock_browsing_data_appcache_helper.cc', diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp index d7eb4ec..4bde4aa 100644 --- a/chrome_frame/chrome_frame.gyp +++ b/chrome_frame/chrome_frame.gyp @@ -118,7 +118,7 @@ 'xulrunner_sdk', ], 'sources': [ - 'chrome_tab.h', + '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h', 'chrome_frame_histograms.h', 'chrome_frame_histograms.cc', 'chrome_frame_unittest_main.cc', @@ -252,7 +252,7 @@ 'npchrome_frame', ], 'sources': [ - '../base/test_suite.h', + '../base/test/test_suite.h', 'cfproxy_test.cc', 'external_tab_test.cc', 'test/automation_client_mock.cc', @@ -289,7 +289,7 @@ 'test/win_event_receiver.cc', 'test/win_event_receiver.h', 'chrome_launcher_version.rc', - 'chrome_tab.h', + '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h', 'test_utils.cc', 'test_utils.h', ], @@ -364,13 +364,13 @@ 'npchrome_frame', ], 'sources': [ - '../base/perf_test_suite.h', + '../base/test/perf_test_suite.h', '../base/perftimer.cc', '../base/test/test_file_util.h', '../chrome/test/chrome_process_util.cc', '../chrome/test/chrome_process_util.h', '../chrome/test/ui/ui_test.cc', - 'chrome_tab.h', + '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h', 'test/chrome_frame_test_utils.cc', 'test/chrome_frame_test_utils.h', 'test/perf/chrome_frame_perftest.cc', @@ -463,7 +463,7 @@ 'test/net/test_automation_provider.h', 'test/net/test_automation_resource_message_filter.cc', 'test/net/test_automation_resource_message_filter.h', - 'chrome_tab.h', + '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h', 'test_utils.cc', 'test_utils.h', ], @@ -534,7 +534,7 @@ 'test/simulate_input.h', 'test/win_event_receiver.cc', 'test/win_event_receiver.h', - 'chrome_tab.h', + '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h', '../base/test/test_file_util_win.cc', '../chrome/test/automation/proxy_launcher.cc', '../chrome/test/automation/proxy_launcher.h', @@ -590,7 +590,7 @@ 'npchrome_frame', ], 'sources': [ - '../base/test_suite.h', + '../base/test/test_suite.h', 'test/chrome_frame_test_utils.cc', 'test/chrome_frame_test_utils.h', 'test/chrome_frame_ui_test_utils.cc', @@ -610,7 +610,7 @@ 'test/test_with_web_server.h', 'test/win_event_receiver.cc', 'test/win_event_receiver.h', - 'chrome_tab.h', + '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h', 'chrome_tab.idl', 'renderer_glue.cc', 'test_utils.cc', @@ -786,7 +786,7 @@ 'chrome_protocol.cc', 'chrome_protocol.h', 'chrome_protocol.rgs', - 'chrome_tab.h', + '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h', 'com_message_event.cc', 'com_message_event.h', 'com_type_info_holder.cc', @@ -969,7 +969,7 @@ 'chrome_frame_reporting.h', 'chrome_tab.cc', 'chrome_tab.def', - 'chrome_tab.h', + '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h', # FIXME(slightlyoff): For chrome_tab.tlb. Giant hack until we can # figure out something more gyp-ish. 'resources/tlb_resource.rc', diff --git a/chrome_frame/chrome_frame_launcher.gyp b/chrome_frame/chrome_frame_launcher.gyp index d357e88..370e262 100644 --- a/chrome_frame/chrome_frame_launcher.gyp +++ b/chrome_frame/chrome_frame_launcher.gyp @@ -152,7 +152,7 @@ 'chrome_frame_helper_util.cc', 'chrome_frame_helper_util.h', 'chrome_frame_helper_version.rc', - 'chrome_tab.h', + '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h', 'chrome_tab.idl', 'event_hooker.cc', 'event_hooker.h', diff --git a/ppapi/ppapi_tests.gypi b/ppapi/ppapi_tests.gypi index 0611734..a8f4bae 100644 --- a/ppapi/ppapi_tests.gypi +++ b/ppapi/ppapi_tests.gypi @@ -276,7 +276,6 @@ 'proxy/ppapi_proxy_test.cc', 'proxy/ppapi_proxy_test.h', 'proxy/serialized_var_unittest.cc', - 'proxy/serialized_var_unittest.h', ], }, ], diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp index 16b9d11..fc855b5 100644 --- a/third_party/libjingle/libjingle.gyp +++ b/third_party/libjingle/libjingle.gyp @@ -183,7 +183,6 @@ 'source/talk/base/event.h', 'source/talk/base/fileutils.cc', 'source/talk/base/fileutils.h', - 'source/talk/base/fileutils_mock.h', 'source/talk/base/firewallsocketserver.cc', 'source/talk/base/firewallsocketserver.h', 'source/talk/base/flags.cc', @@ -201,7 +200,6 @@ 'source/talk/base/httpcommon.h', 'source/talk/base/httprequest.cc', 'source/talk/base/httprequest.h', - 'source/talk/base/icftypes.h', 'source/talk/base/linked_ptr.h', 'source/talk/base/logging.cc', 'source/talk/base/md5.h', diff --git a/views/views.gyp b/views/views.gyp index d41d1b1..23d1f40 100644 --- a/views/views.gyp +++ b/views/views.gyp @@ -153,7 +153,6 @@ 'controls/menu/menu_scroll_view_container.h', 'controls/menu/menu_separator.h', 'controls/menu/menu_separator_gtk.cc', - 'controls/menu/menu_separator_gtk.h', 'controls/menu/menu_separator_win.cc', 'controls/menu/menu_win.cc', 'controls/menu/menu_win.h', @@ -302,7 +301,6 @@ 'screen.h', 'screen_gtk.cc', 'screen_win.cc', - 'standard_layout.h', 'touchui/gesture_manager.cc', 'touchui/gesture_manager.h', 'touchui/touch_factory.cc', |