Chromium Code Reviews
|
|
Chromium Code Reviews
Issue
62333027:
Fix horrifically-out-of-order gyp files. (Closed)
|
Created:
7 years, 1 month ago by Avi (use Gerrit) Modified:
7 years, 1 month ago Reviewers:
jam CC:
chromium-reviews, joi+watch-content_chromium.org, darin-cc_chromium.org, jam Base URL:
svn://svn.chromium.org/chrome/trunk/src Visibility:
Public. |
DescriptionFix horrifically-out-of-order gyp files.
BUG=none
TEST=none
R=jam@chromium.org
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=235847
Patch Set 1 #Patch Set 2 : rebase #
Messages
Total messages: 7 (0 generated)
lgtm
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/avi@chromium.org/62333027/1
Failed to apply patch for content/content_renderer.gypi:
While running patch -p1 --forward --force --no-backup-if-mismatch;
patching file content/content_renderer.gypi
Hunk #7 FAILED at 492.
1 out of 7 hunks FAILED -- saving rejects to file
content/content_renderer.gypi.rej
Patch: content/content_renderer.gypi
Index: content/content_renderer.gypi
diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi
index
736fc823c407360e0110a7614351d13c70adc5bc..246c55e5ee91c432028982efadeb24be00de695b
100644
--- a/content/content_renderer.gypi
+++ b/content/content_renderer.gypi
@@ -79,10 +79,27 @@
'renderer/android/phone_number_detector.h',
'renderer/android/synchronous_compositor_factory.cc',
'renderer/android/synchronous_compositor_factory.h',
+ 'renderer/browser_plugin/browser_plugin.cc',
+ 'renderer/browser_plugin/browser_plugin.h',
+ 'renderer/browser_plugin/browser_plugin_backing_store.cc',
+ 'renderer/browser_plugin/browser_plugin_backing_store.h',
+ 'renderer/browser_plugin/browser_plugin_bindings.cc',
+ 'renderer/browser_plugin/browser_plugin_bindings.h',
+ 'renderer/browser_plugin/browser_plugin_compositing_helper.cc',
+ 'renderer/browser_plugin/browser_plugin_compositing_helper.h',
+ 'renderer/browser_plugin/browser_plugin_manager_factory.h',
+ 'renderer/browser_plugin/browser_plugin_manager_impl.cc',
+ 'renderer/browser_plugin/browser_plugin_manager_impl.h',
+ 'renderer/browser_plugin/browser_plugin_manager.cc',
+ 'renderer/browser_plugin/browser_plugin_manager.h',
'renderer/clipboard_utils.cc',
'renderer/clipboard_utils.h',
+ 'renderer/context_menu_params_builder.cc',
+ 'renderer/context_menu_params_builder.h',
'renderer/cursor_utils.cc',
'renderer/cursor_utils.h',
+ 'renderer/date_time_formatter.cc',
+ 'renderer/date_time_formatter.h',
'renderer/device_orientation/device_motion_event_pump.cc',
'renderer/device_orientation/device_motion_event_pump.h',
'renderer/device_orientation/device_orientation_event_pump.cc',
@@ -112,6 +129,14 @@
'renderer/drop_data_builder.h',
'renderer/external_popup_menu.cc',
'renderer/external_popup_menu.h',
+ 'renderer/fetchers/alt_error_page_resource_fetcher.cc',
+ 'renderer/fetchers/alt_error_page_resource_fetcher.h',
+ 'renderer/fetchers/image_resource_fetcher.cc',
+ 'renderer/fetchers/image_resource_fetcher.h',
+ 'renderer/fetchers/multi_resolution_image_resource_fetcher.cc',
+ 'renderer/fetchers/multi_resolution_image_resource_fetcher.h',
+ 'renderer/fetchers/resource_fetcher.cc',
+ 'renderer/fetchers/resource_fetcher.h',
'renderer/gamepad_shared_memory_reader.cc',
'renderer/gamepad_shared_memory_reader.h',
'renderer/geolocation_dispatcher.cc',
@@ -122,27 +147,29 @@
'renderer/gpu/compositor_software_output_device.h',
'renderer/gpu/delegated_compositor_output_surface.cc',
'renderer/gpu/delegated_compositor_output_surface.h',
+ 'renderer/gpu/gpu_benchmarking_extension.cc',
+ 'renderer/gpu/gpu_benchmarking_extension.h',
'renderer/gpu/input_event_filter.cc',
'renderer/gpu/input_event_filter.h',
- 'renderer/gpu/input_handler_proxy.cc',
- 'renderer/gpu/input_handler_proxy.h',
'renderer/gpu/input_handler_manager.cc',
'renderer/gpu/input_handler_manager.h',
'renderer/gpu/input_handler_manager_client.h',
+ 'renderer/gpu/input_handler_proxy.cc',
+ 'renderer/gpu/input_handler_proxy.h',
'renderer/gpu/input_handler_wrapper.cc',
'renderer/gpu/input_handler_wrapper.h',
- 'renderer/gpu/gpu_benchmarking_extension.cc',
- 'renderer/gpu/gpu_benchmarking_extension.h',
'renderer/gpu/mailbox_output_surface.cc',
'renderer/gpu/mailbox_output_surface.h',
- 'renderer/gpu/stream_texture_host_android.cc',
- 'renderer/gpu/stream_texture_host_android.h',
'renderer/gpu/render_widget_compositor.cc',
'renderer/gpu/render_widget_compositor.h',
+ 'renderer/gpu/stream_texture_host_android.cc',
+ 'renderer/gpu/stream_texture_host_android.h',
'renderer/idle_user_detector.cc',
'renderer/idle_user_detector.h',
'renderer/image_loading_helper.cc',
'renderer/image_loading_helper.h',
+ 'renderer/ime_event_guard.cc',
+ 'renderer/ime_event_guard.h',
'renderer/in_process_renderer_thread.cc',
'renderer/in_process_renderer_thread.h',
'renderer/input_tag_speech_dispatcher.cc',
@@ -268,6 +295,12 @@
'renderer/mouse_lock_dispatcher.h',
'renderer/notification_provider.cc',
'renderer/notification_provider.h',
+ 'renderer/npapi/plugin_channel_host.cc',
+ 'renderer/npapi/plugin_channel_host.h',
+ 'renderer/npapi/webplugin_delegate_proxy.cc',
+ 'renderer/npapi/webplugin_delegate_proxy.h',
+ 'renderer/npapi/webplugin_impl.cc',
+ 'renderer/npapi/webplugin_impl.h',
'renderer/paint_aggregator.cc',
'renderer/paint_aggregator.h',
'renderer/pepper/audio_helper.cc',
@@ -396,39 +429,6 @@
'renderer/pepper/usb_key_code_conversion_win.cc',
'renderer/pepper/v8_var_converter.cc',
'renderer/pepper/v8_var_converter.h',
- 'renderer/browser_plugin/browser_plugin.cc',
- 'renderer/browser_plugin/browser_plugin.h',
- 'renderer/browser_plugin/browser_plugin_backing_store.h',
- 'renderer/browser_plugin/browser_plugin_backing_store.cc',
- 'renderer/browser_plugin/browser_plugin_bindings.h',
- 'renderer/browser_plugin/browser_plugin_bindings.cc',
- 'renderer/browser_plugin/browser_plugin_manager.h',
- 'renderer/browser_plugin/browser_plugin_manager.cc',
- 'renderer/browser_plugin/browser_plugin_manager_factory.h',
- 'renderer/browser_plugin/browser_plugin_manager_impl.h',
- 'renderer/browser_plugin/browser_plugin_manager_impl.cc',
- 'renderer/browser_plugin/browser_plugin_compositing_helper.h',
- 'renderer/browser_plugin/browser_plugin_compositing_helper.cc',
- 'renderer/context_menu_params_builder.cc',
- 'renderer/context_menu_params_builder.h',
- 'renderer/date_time_formatter.cc',
- 'renderer/date_time_formatter.h',
- 'renderer/fetchers/alt_error_page_resource_fetcher.cc',
- 'renderer/fetchers/alt_error_page_resource_fetcher.h',
- 'renderer/fetchers/image_resource_fetcher.cc',
- 'renderer/fetchers/image_resource_fetcher.h',
- 'renderer/fetchers/multi_resolution_image_resource_fetcher.cc',
- 'renderer/fetchers/multi_resolution_image_resource_fetcher.h',
- 'renderer/fetchers/resource_fetcher.cc',
- 'renderer/fetchers/resource_fetcher.h',
- 'renderer/ime_event_guard.cc',
- 'renderer/ime_event_guard.h',
- 'renderer/npapi/plugin_channel_host.cc',
- 'renderer/npapi/plugin_channel_host.h',
- 'renderer/npapi/webplugin_delegate_proxy.cc',
- 'renderer/npapi/webplugin_delegate_proxy.h',
- 'renderer/npapi/webplugin_impl.cc',
- 'renderer/npapi/webplugin_impl.h',
'renderer/render_frame_impl.cc',
'renderer/render_frame_impl.h',
'renderer/render_process.h',
@@ -462,10 +462,10 @@
'renderer/renderer_main_platform_delegate_win.cc',
'renderer/renderer_webapplicationcachehost_impl.cc',
'renderer/renderer_webapplicationcachehost_impl.h',
- 'renderer/renderer_webcookiejar_impl.cc',
- 'renderer/renderer_webcookiejar_impl.h',
'renderer/renderer_webcolorchooser_impl.cc',
'renderer/renderer_webcolorchooser_impl.h',
+ 'renderer/renderer_webcookiejar_impl.cc',
+ 'renderer/renderer_webcookiejar_impl.h',
'renderer/renderer_webkitplatformsupport_impl.cc',
'renderer/renderer_webkitplatformsupport_impl.h',
'renderer/resizing_mode_selector.cc',
@@ -492,13 +492,13 @@
'renderer/text_input_client_observer.h',
'renderer/v8_value_converter_impl.cc',
'renderer/v8_value_converter_impl.h',
- 'renderer/webclipboard_impl.cc',
- 'renderer/webclipboard_impl.h',
'renderer/web_preferences.cc',
'renderer/web_ui_extension.cc',
'renderer/web_ui_extension.h',
'renderer/web_ui_extension_data.cc',
'renderer/web_ui_extension_data.h',
+ 'renderer/webclipboard_impl.cc',
+ 'renderer/webclipboard_impl.h',
'renderer/webcrypto/webcrypto_impl.cc',
'renderer/webcrypto/webcrypto_impl.h',
'renderer/webcrypto/webcrypto_impl_nss.cc',
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/avi@chromium.org/62333027/100001
Failed to apply patch for content/content_renderer.gypi:
While running patch -p1 --forward --force --no-backup-if-mismatch;
patching file content/content_renderer.gypi
Hunk #7 FAILED at 492.
1 out of 7 hunks FAILED -- saving rejects to file
content/content_renderer.gypi.rej
Patch: content/content_renderer.gypi
Index: content/content_renderer.gypi
diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi
index
736fc823c407360e0110a7614351d13c70adc5bc..246c55e5ee91c432028982efadeb24be00de695b
100644
--- a/content/content_renderer.gypi
+++ b/content/content_renderer.gypi
@@ -79,10 +79,27 @@
'renderer/android/phone_number_detector.h',
'renderer/android/synchronous_compositor_factory.cc',
'renderer/android/synchronous_compositor_factory.h',
+ 'renderer/browser_plugin/browser_plugin.cc',
+ 'renderer/browser_plugin/browser_plugin.h',
+ 'renderer/browser_plugin/browser_plugin_backing_store.cc',
+ 'renderer/browser_plugin/browser_plugin_backing_store.h',
+ 'renderer/browser_plugin/browser_plugin_bindings.cc',
+ 'renderer/browser_plugin/browser_plugin_bindings.h',
+ 'renderer/browser_plugin/browser_plugin_compositing_helper.cc',
+ 'renderer/browser_plugin/browser_plugin_compositing_helper.h',
+ 'renderer/browser_plugin/browser_plugin_manager_factory.h',
+ 'renderer/browser_plugin/browser_plugin_manager_impl.cc',
+ 'renderer/browser_plugin/browser_plugin_manager_impl.h',
+ 'renderer/browser_plugin/browser_plugin_manager.cc',
+ 'renderer/browser_plugin/browser_plugin_manager.h',
'renderer/clipboard_utils.cc',
'renderer/clipboard_utils.h',
+ 'renderer/context_menu_params_builder.cc',
+ 'renderer/context_menu_params_builder.h',
'renderer/cursor_utils.cc',
'renderer/cursor_utils.h',
+ 'renderer/date_time_formatter.cc',
+ 'renderer/date_time_formatter.h',
'renderer/device_orientation/device_motion_event_pump.cc',
'renderer/device_orientation/device_motion_event_pump.h',
'renderer/device_orientation/device_orientation_event_pump.cc',
@@ -112,6 +129,14 @@
'renderer/drop_data_builder.h',
'renderer/external_popup_menu.cc',
'renderer/external_popup_menu.h',
+ 'renderer/fetchers/alt_error_page_resource_fetcher.cc',
+ 'renderer/fetchers/alt_error_page_resource_fetcher.h',
+ 'renderer/fetchers/image_resource_fetcher.cc',
+ 'renderer/fetchers/image_resource_fetcher.h',
+ 'renderer/fetchers/multi_resolution_image_resource_fetcher.cc',
+ 'renderer/fetchers/multi_resolution_image_resource_fetcher.h',
+ 'renderer/fetchers/resource_fetcher.cc',
+ 'renderer/fetchers/resource_fetcher.h',
'renderer/gamepad_shared_memory_reader.cc',
'renderer/gamepad_shared_memory_reader.h',
'renderer/geolocation_dispatcher.cc',
@@ -122,27 +147,29 @@
'renderer/gpu/compositor_software_output_device.h',
'renderer/gpu/delegated_compositor_output_surface.cc',
'renderer/gpu/delegated_compositor_output_surface.h',
+ 'renderer/gpu/gpu_benchmarking_extension.cc',
+ 'renderer/gpu/gpu_benchmarking_extension.h',
'renderer/gpu/input_event_filter.cc',
'renderer/gpu/input_event_filter.h',
- 'renderer/gpu/input_handler_proxy.cc',
- 'renderer/gpu/input_handler_proxy.h',
'renderer/gpu/input_handler_manager.cc',
'renderer/gpu/input_handler_manager.h',
'renderer/gpu/input_handler_manager_client.h',
+ 'renderer/gpu/input_handler_proxy.cc',
+ 'renderer/gpu/input_handler_proxy.h',
'renderer/gpu/input_handler_wrapper.cc',
'renderer/gpu/input_handler_wrapper.h',
- 'renderer/gpu/gpu_benchmarking_extension.cc',
- 'renderer/gpu/gpu_benchmarking_extension.h',
'renderer/gpu/mailbox_output_surface.cc',
'renderer/gpu/mailbox_output_surface.h',
- 'renderer/gpu/stream_texture_host_android.cc',
- 'renderer/gpu/stream_texture_host_android.h',
'renderer/gpu/render_widget_compositor.cc',
'renderer/gpu/render_widget_compositor.h',
+ 'renderer/gpu/stream_texture_host_android.cc',
+ 'renderer/gpu/stream_texture_host_android.h',
'renderer/idle_user_detector.cc',
'renderer/idle_user_detector.h',
'renderer/image_loading_helper.cc',
'renderer/image_loading_helper.h',
+ 'renderer/ime_event_guard.cc',
+ 'renderer/ime_event_guard.h',
'renderer/in_process_renderer_thread.cc',
'renderer/in_process_renderer_thread.h',
'renderer/input_tag_speech_dispatcher.cc',
@@ -268,6 +295,12 @@
'renderer/mouse_lock_dispatcher.h',
'renderer/notification_provider.cc',
'renderer/notification_provider.h',
+ 'renderer/npapi/plugin_channel_host.cc',
+ 'renderer/npapi/plugin_channel_host.h',
+ 'renderer/npapi/webplugin_delegate_proxy.cc',
+ 'renderer/npapi/webplugin_delegate_proxy.h',
+ 'renderer/npapi/webplugin_impl.cc',
+ 'renderer/npapi/webplugin_impl.h',
'renderer/paint_aggregator.cc',
'renderer/paint_aggregator.h',
'renderer/pepper/audio_helper.cc',
@@ -396,39 +429,6 @@
'renderer/pepper/usb_key_code_conversion_win.cc',
'renderer/pepper/v8_var_converter.cc',
'renderer/pepper/v8_var_converter.h',
- 'renderer/browser_plugin/browser_plugin.cc',
- 'renderer/browser_plugin/browser_plugin.h',
- 'renderer/browser_plugin/browser_plugin_backing_store.h',
- 'renderer/browser_plugin/browser_plugin_backing_store.cc',
- 'renderer/browser_plugin/browser_plugin_bindings.h',
- 'renderer/browser_plugin/browser_plugin_bindings.cc',
- 'renderer/browser_plugin/browser_plugin_manager.h',
- 'renderer/browser_plugin/browser_plugin_manager.cc',
- 'renderer/browser_plugin/browser_plugin_manager_factory.h',
- 'renderer/browser_plugin/browser_plugin_manager_impl.h',
- 'renderer/browser_plugin/browser_plugin_manager_impl.cc',
- 'renderer/browser_plugin/browser_plugin_compositing_helper.h',
- 'renderer/browser_plugin/browser_plugin_compositing_helper.cc',
- 'renderer/context_menu_params_builder.cc',
- 'renderer/context_menu_params_builder.h',
- 'renderer/date_time_formatter.cc',
- 'renderer/date_time_formatter.h',
- 'renderer/fetchers/alt_error_page_resource_fetcher.cc',
- 'renderer/fetchers/alt_error_page_resource_fetcher.h',
- 'renderer/fetchers/image_resource_fetcher.cc',
- 'renderer/fetchers/image_resource_fetcher.h',
- 'renderer/fetchers/multi_resolution_image_resource_fetcher.cc',
- 'renderer/fetchers/multi_resolution_image_resource_fetcher.h',
- 'renderer/fetchers/resource_fetcher.cc',
- 'renderer/fetchers/resource_fetcher.h',
- 'renderer/ime_event_guard.cc',
- 'renderer/ime_event_guard.h',
- 'renderer/npapi/plugin_channel_host.cc',
- 'renderer/npapi/plugin_channel_host.h',
- 'renderer/npapi/webplugin_delegate_proxy.cc',
- 'renderer/npapi/webplugin_delegate_proxy.h',
- 'renderer/npapi/webplugin_impl.cc',
- 'renderer/npapi/webplugin_impl.h',
'renderer/render_frame_impl.cc',
'renderer/render_frame_impl.h',
'renderer/render_process.h',
@@ -462,10 +462,10 @@
'renderer/renderer_main_platform_delegate_win.cc',
'renderer/renderer_webapplicationcachehost_impl.cc',
'renderer/renderer_webapplicationcachehost_impl.h',
- 'renderer/renderer_webcookiejar_impl.cc',
- 'renderer/renderer_webcookiejar_impl.h',
'renderer/renderer_webcolorchooser_impl.cc',
'renderer/renderer_webcolorchooser_impl.h',
+ 'renderer/renderer_webcookiejar_impl.cc',
+ 'renderer/renderer_webcookiejar_impl.h',
'renderer/renderer_webkitplatformsupport_impl.cc',
'renderer/renderer_webkitplatformsupport_impl.h',
'renderer/resizing_mode_selector.cc',
@@ -492,13 +492,13 @@
'renderer/text_input_client_observer.h',
'renderer/v8_value_converter_impl.cc',
'renderer/v8_value_converter_impl.h',
- 'renderer/webclipboard_impl.cc',
- 'renderer/webclipboard_impl.h',
'renderer/web_preferences.cc',
'renderer/web_ui_extension.cc',
'renderer/web_ui_extension.h',
'renderer/web_ui_extension_data.cc',
'renderer/web_ui_extension_data.h',
+ 'renderer/webclipboard_impl.cc',
+ 'renderer/webclipboard_impl.h',
'renderer/webcrypto/webcrypto_impl.cc',
'renderer/webcrypto/webcrypto_impl.h',
'renderer/webcrypto/webcrypto_impl_nss.cc',
Message was sent while issue was closed.
Committed patchset #2 manually as r235847 (presubmit successful). |
|||||||||||||||||||||||||||||||||||||||||||||||||||||||
