| Index: chrome/chrome_debugger.gypi
|
| diff --git a/chrome/chrome_debugger.gypi b/chrome/chrome_debugger.gypi
|
| index 8a5119cb401eb4c20aeca9b697d0a4d08225af68..4c6a56fd9b9d0e1164e1d35c6b35bd67ca7c9d34 100644
|
| --- a/chrome/chrome_debugger.gypi
|
| +++ b/chrome/chrome_debugger.gypi
|
| @@ -12,59 +12,15 @@
|
| 'dependencies': [
|
| '../base/base.gyp:base',
|
| '../content/content.gyp:content_browser',
|
| - '../net/net.gyp:http_server',
|
| '../net/net.gyp:net',
|
| - '../skia/skia.gyp:skia',
|
| - '../third_party/icu/icu.gyp:icui18n',
|
| - '../third_party/icu/icu.gyp:icuuc',
|
| - '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
|
| - '../third_party/libusb/libusb.gyp:libusb',
|
| 'browser/devtools/devtools_protocol_constants.gyp:devtools_protocol_constants',
|
| - 'chrome_resources.gyp:chrome_extra_resources',
|
| - 'chrome_resources.gyp:chrome_resources',
|
| - 'chrome_resources.gyp:chrome_strings',
|
| - 'chrome_resources.gyp:theme_resources',
|
| - 'common/extensions/api/api.gyp:chrome_api',
|
| ],
|
| 'include_dirs': [
|
| '..',
|
| ],
|
| 'sources': [
|
| - 'browser/devtools/device/adb/adb_client_socket.cc',
|
| - 'browser/devtools/device/adb/adb_client_socket.h',
|
| - 'browser/devtools/device/adb/adb_device_info_query.cc',
|
| - 'browser/devtools/device/adb/adb_device_info_query.h',
|
| - 'browser/devtools/device/adb/adb_device_provider.cc',
|
| - 'browser/devtools/device/adb/adb_device_provider.h',
|
| - 'browser/devtools/device/android_device_manager.cc',
|
| - 'browser/devtools/device/android_device_manager.h',
|
| - 'browser/devtools/device/android_web_socket.cc',
|
| - 'browser/devtools/device/devtools_android_bridge.cc',
|
| - 'browser/devtools/device/devtools_android_bridge.h',
|
| - 'browser/devtools/device/port_forwarding_controller.cc',
|
| - 'browser/devtools/device/port_forwarding_controller.h',
|
| - 'browser/devtools/device/self_device_provider.cc',
|
| - 'browser/devtools/device/self_device_provider.h',
|
| - 'browser/devtools/device/usb/android_rsa.cc',
|
| - 'browser/devtools/device/usb/android_rsa.h',
|
| - 'browser/devtools/device/usb/android_usb_device.cc',
|
| - 'browser/devtools/device/usb/android_usb_device.h',
|
| - 'browser/devtools/device/usb/android_usb_socket.cc',
|
| - 'browser/devtools/device/usb/android_usb_socket.h',
|
| - 'browser/devtools/device/usb/usb_device_provider.cc',
|
| - 'browser/devtools/device/usb/usb_device_provider.h',
|
| - 'browser/devtools/browser_list_tabcontents_provider.cc',
|
| - 'browser/devtools/browser_list_tabcontents_provider.h',
|
| 'browser/devtools/chrome_devtools_manager_delegate.cc',
|
| 'browser/devtools/chrome_devtools_manager_delegate.h',
|
| - 'browser/devtools/devtools_contents_resizing_strategy.cc',
|
| - 'browser/devtools/devtools_contents_resizing_strategy.h',
|
| - 'browser/devtools/devtools_embedder_message_dispatcher.cc',
|
| - 'browser/devtools/devtools_embedder_message_dispatcher.h',
|
| - 'browser/devtools/devtools_file_helper.cc',
|
| - 'browser/devtools/devtools_file_helper.h',
|
| - 'browser/devtools/devtools_file_system_indexer.cc',
|
| - 'browser/devtools/devtools_file_system_indexer.h',
|
| 'browser/devtools/devtools_network_conditions.cc',
|
| 'browser/devtools/devtools_network_conditions.h',
|
| 'browser/devtools/devtools_network_controller.cc',
|
| @@ -77,38 +33,73 @@
|
| 'browser/devtools/devtools_network_transaction_factory.h',
|
| 'browser/devtools/devtools_protocol.cc',
|
| 'browser/devtools/devtools_protocol.h',
|
| - 'browser/devtools/devtools_target_impl.cc',
|
| - 'browser/devtools/devtools_target_impl.h',
|
| - 'browser/devtools/devtools_targets_ui.cc',
|
| - 'browser/devtools/devtools_targets_ui.h',
|
| - 'browser/devtools/devtools_toggle_action.cc',
|
| - 'browser/devtools/devtools_toggle_action.h',
|
| - 'browser/devtools/devtools_ui_bindings.cc',
|
| - 'browser/devtools/devtools_ui_bindings.h',
|
| - 'browser/devtools/devtools_window.cc',
|
| - 'browser/devtools/devtools_window.h',
|
| - 'browser/devtools/remote_debugging_server.cc',
|
| - 'browser/devtools/remote_debugging_server.h',
|
| # These files are generated by devtools_protocol_constants_generator.py.
|
| '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/devtools/devtools_protocol_constants.cc',
|
| '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/devtools/devtools_protocol_constants.h',
|
| ],
|
| 'conditions': [
|
| - ['OS=="android"', {
|
| - 'dependencies!': [
|
| + ['OS!="android"', {
|
| + 'dependencies': [
|
| + '../net/net.gyp:http_server',
|
| + '../skia/skia.gyp:skia',
|
| + '../third_party/icu/icu.gyp:icui18n',
|
| + '../third_party/icu/icu.gyp:icuuc',
|
| + '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
|
| '../third_party/libusb/libusb.gyp:libusb',
|
| + 'chrome_resources.gyp:chrome_extra_resources',
|
| + 'chrome_resources.gyp:chrome_resources',
|
| + 'chrome_resources.gyp:chrome_strings',
|
| + 'chrome_resources.gyp:theme_resources',
|
| + 'common/extensions/api/api.gyp:chrome_api',
|
| ],
|
| - 'sources!': [
|
| + 'sources': [
|
| + 'browser/devtools/device/adb/adb_client_socket.cc',
|
| + 'browser/devtools/device/adb/adb_client_socket.h',
|
| + 'browser/devtools/device/adb/adb_device_info_query.cc',
|
| + 'browser/devtools/device/adb/adb_device_info_query.h',
|
| + 'browser/devtools/device/adb/adb_device_provider.cc',
|
| + 'browser/devtools/device/adb/adb_device_provider.h',
|
| + 'browser/devtools/device/android_device_manager.cc',
|
| + 'browser/devtools/device/android_device_manager.h',
|
| + 'browser/devtools/device/android_web_socket.cc',
|
| + 'browser/devtools/device/devtools_android_bridge.cc',
|
| + 'browser/devtools/device/devtools_android_bridge.h',
|
| + 'browser/devtools/device/port_forwarding_controller.cc',
|
| + 'browser/devtools/device/port_forwarding_controller.h',
|
| + 'browser/devtools/device/self_device_provider.cc',
|
| + 'browser/devtools/device/self_device_provider.h',
|
| 'browser/devtools/device/usb/android_rsa.cc',
|
| + 'browser/devtools/device/usb/android_rsa.h',
|
| + 'browser/devtools/device/usb/android_usb_device.cc',
|
| + 'browser/devtools/device/usb/android_usb_device.h',
|
| + 'browser/devtools/device/usb/android_usb_socket.cc',
|
| + 'browser/devtools/device/usb/android_usb_socket.h',
|
| + 'browser/devtools/device/usb/usb_device_provider.cc',
|
| + 'browser/devtools/device/usb/usb_device_provider.h',
|
| 'browser/devtools/browser_list_tabcontents_provider.cc',
|
| + 'browser/devtools/browser_list_tabcontents_provider.h',
|
| + 'browser/devtools/devtools_contents_resizing_strategy.cc',
|
| + 'browser/devtools/devtools_contents_resizing_strategy.h',
|
| + 'browser/devtools/devtools_embedder_message_dispatcher.cc',
|
| + 'browser/devtools/devtools_embedder_message_dispatcher.h',
|
| + 'browser/devtools/devtools_file_helper.cc',
|
| + 'browser/devtools/devtools_file_helper.h',
|
| 'browser/devtools/devtools_file_system_indexer.cc',
|
| + 'browser/devtools/devtools_file_system_indexer.h',
|
| 'browser/devtools/devtools_target_impl.cc',
|
| + 'browser/devtools/devtools_target_impl.h',
|
| + 'browser/devtools/devtools_targets_ui.cc',
|
| + 'browser/devtools/devtools_targets_ui.h',
|
| + 'browser/devtools/devtools_toggle_action.cc',
|
| + 'browser/devtools/devtools_toggle_action.h',
|
| 'browser/devtools/devtools_ui_bindings.cc',
|
| + 'browser/devtools/devtools_ui_bindings.h',
|
| 'browser/devtools/devtools_window.cc',
|
| - 'browser/devtools/devtools_window_base.cc',
|
| + 'browser/devtools/devtools_window.h',
|
| 'browser/devtools/remote_debugging_server.cc',
|
| + 'browser/devtools/remote_debugging_server.h',
|
| ],
|
| - }],
|
| + }], # OS!="android"
|
| ['debug_devtools==1', {
|
| 'defines': [
|
| 'DEBUG_DEVTOOLS=1',
|
|
|