Skip to content

GitLab

T
tangled
Commit 31cfeb79 authored by dgozman@chromium.org's avatar dgozman@chromium.org
Browse files
Options

[DevTools] Do not build most of chrome/browser/devtools on android. 

BUG=none

Review URL: https://codereview.chromium.org/378303002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282596 0039d316-1c4b-4281-b951-d872f2087c98
parent 326fd075
Show whitespace changes
Inline Side-by-side
Showing with 108 additions and 121 deletions
chrome/browser/devtools/BUILD.gn
View file @ 31cfeb79
...@@ -19,42 +19,10 @@ action("devtools_protocol_constants") { ...@@ -19,42 +19,10 @@ action("devtools_protocol_constants") {
# GYP version: chrome/chrome_debugger.gypi:debugger # GYP version: chrome/chrome_debugger.gypi:debugger
static_library("devtools") { static_library("devtools") {
# Note: new sources and deps should be generally added in (!is_android) below.
sources = [ sources = [
"device/adb/adb_client_socket.cc",
"device/adb/adb_client_socket.h",
"device/adb/adb_device_info_query.cc",
"device/adb/adb_device_info_query.h",
"device/adb/adb_device_provider.cc",
"device/adb/adb_device_provider.h",
"device/android_device_manager.cc",
"device/android_device_manager.h",
"device/android_web_socket.cc",
"device/devtools_android_bridge.cc",
"device/devtools_android_bridge.h",
"device/port_forwarding_controller.cc",
"device/port_forwarding_controller.h",
"device/self_device_provider.cc",
"device/self_device_provider.h",
"device/usb/android_rsa.cc",
"device/usb/android_rsa.h",
"device/usb/android_usb_device.cc",
"device/usb/android_usb_device.h",
"device/usb/android_usb_socket.cc",
"device/usb/android_usb_socket.h",
"device/usb/usb_device_provider.cc",
"device/usb/usb_device_provider.h",
"browser_list_tabcontents_provider.cc",
"browser_list_tabcontents_provider.h",
"chrome_devtools_manager_delegate.cc", "chrome_devtools_manager_delegate.cc",
"chrome_devtools_manager_delegate.h", "chrome_devtools_manager_delegate.h",
"devtools_contents_resizing_strategy.cc",
"devtools_contents_resizing_strategy.h",
"devtools_embedder_message_dispatcher.cc",
"devtools_embedder_message_dispatcher.h",
"devtools_file_helper.cc",
"devtools_file_helper.h",
"devtools_file_system_indexer.cc",
"devtools_file_system_indexer.h",
"devtools_network_conditions.cc", "devtools_network_conditions.cc",
"devtools_network_conditions.h", "devtools_network_conditions.h",
"devtools_network_controller.cc", "devtools_network_controller.cc",
...@@ -66,19 +34,7 @@ static_library("devtools") { ...@@ -66,19 +34,7 @@ static_library("devtools") {
"devtools_network_transaction_factory.cc", "devtools_network_transaction_factory.cc",
"devtools_network_transaction_factory.h", "devtools_network_transaction_factory.h",
"devtools_protocol.cc", "devtools_protocol.cc",
"devtools_protocol.h", "devtools_protocol.h"
"devtools_target_impl.cc",
"devtools_target_impl.h",
"devtools_targets_ui.cc",
"devtools_targets_ui.h",
"devtools_toggle_action.cc",
"devtools_toggle_action.h",
"devtools_ui_bindings.cc",
"devtools_ui_bindings.h",
"devtools_window.cc",
"devtools_window.h",
"remote_debugging_server.cc",
"remote_debugging_server.h",
] ]
sources += get_target_outputs(":devtools_protocol_constants") sources += get_target_outputs(":devtools_protocol_constants")
...@@ -97,30 +53,69 @@ static_library("devtools") { ...@@ -97,30 +53,69 @@ static_library("devtools") {
deps = [ deps = [
":devtools_protocol_constants", ":devtools_protocol_constants",
"//base", "//base",
"//content/public/browser",
"//net",
]
if (!is_android) {
deps += [
"//chrome:extra_resources", "//chrome:extra_resources",
"//chrome:resources", "//chrome:resources",
"//chrome:strings", "//chrome:strings",
"//chrome/app/theme:theme_resources", "//chrome/app/theme:theme_resources",
"//chrome/common/extensions/api", "//chrome/common/extensions/api",
"//content/public/browser",
"//net",
"//net:http_server", "//net:http_server",
"//skia", "//skia",
"//third_party/icu", "//third_party/icu",
"//third_party/leveldatabase", "//third_party/leveldatabase",
"//third_party/libusb"
] ]
if (is_android) { sources += [
sources -= [ "device/adb/adb_client_socket.cc",
"device/adb/adb_client_socket.h",
"device/adb/adb_device_info_query.cc",
"device/adb/adb_device_info_query.h",
"device/adb/adb_device_provider.cc",
"device/adb/adb_device_provider.h",
"device/android_device_manager.cc",
"device/android_device_manager.h",
"device/android_web_socket.cc",
"device/devtools_android_bridge.cc",
"device/devtools_android_bridge.h",
"device/port_forwarding_controller.cc",
"device/port_forwarding_controller.h",
"device/self_device_provider.cc",
"device/self_device_provider.h",
"device/usb/android_rsa.cc", "device/usb/android_rsa.cc",
"device/usb/android_rsa.h",
"device/usb/android_usb_device.cc",
"device/usb/android_usb_device.h",
"device/usb/android_usb_socket.cc",
"device/usb/android_usb_socket.h",
"device/usb/usb_device_provider.cc",
"device/usb/usb_device_provider.h",
"browser_list_tabcontents_provider.cc", "browser_list_tabcontents_provider.cc",
"browser_list_tabcontents_provider.h",
"devtools_contents_resizing_strategy.cc",
"devtools_contents_resizing_strategy.h",
"devtools_embedder_message_dispatcher.cc",
"devtools_embedder_message_dispatcher.h",
"devtools_file_helper.cc",
"devtools_file_helper.h",
"devtools_file_system_indexer.cc", "devtools_file_system_indexer.cc",
"devtools_file_system_indexer.h",
"devtools_target_impl.cc", "devtools_target_impl.cc",
"devtools_target_impl.h",
"devtools_targets_ui.cc",
"devtools_targets_ui.h",
"devtools_toggle_action.cc",
"devtools_toggle_action.h",
"devtools_ui_bindings.cc", "devtools_ui_bindings.cc",
"devtools_ui_bindings.h",
"devtools_window.cc", "devtools_window.cc",
"devtools_window_base.cc", "devtools_window.h",
"remote_debugging_server.cc", "remote_debugging_server.cc",
"remote_debugging_server.h"
] ]
} else {
deps += [ "//third_party/libusb" ]
} }
} }
chrome/chrome_debugger.gypi
View file @ 31cfeb79
...@@ -12,23 +12,46 @@ ...@@ -12,23 +12,46 @@
'dependencies': [ 'dependencies': [
'../base/base.gyp:base', '../base/base.gyp:base',
'../content/content.gyp:content_browser', '../content/content.gyp:content_browser',
'../net/net.gyp:http_server',
'../net/net.gyp:net', '../net/net.gyp:net',
'browser/devtools/devtools_protocol_constants.gyp:devtools_protocol_constants',
],
'include_dirs': [
'..',
],
'sources': [
'browser/devtools/chrome_devtools_manager_delegate.cc',
'browser/devtools/chrome_devtools_manager_delegate.h',
'browser/devtools/devtools_network_conditions.cc',
'browser/devtools/devtools_network_conditions.h',
'browser/devtools/devtools_network_controller.cc',
'browser/devtools/devtools_network_controller.h',
'browser/devtools/devtools_network_interceptor.cc',
'browser/devtools/devtools_network_interceptor.h',
'browser/devtools/devtools_network_transaction.cc',
'browser/devtools/devtools_network_transaction.h',
'browser/devtools/devtools_network_transaction_factory.cc',
'browser/devtools/devtools_network_transaction_factory.h',
'browser/devtools/devtools_protocol.cc',
'browser/devtools/devtools_protocol.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': [
'../net/net.gyp:http_server',
'../skia/skia.gyp:skia', '../skia/skia.gyp:skia',
'../third_party/icu/icu.gyp:icui18n', '../third_party/icu/icu.gyp:icui18n',
'../third_party/icu/icu.gyp:icuuc', '../third_party/icu/icu.gyp:icuuc',
'../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
'../third_party/libusb/libusb.gyp:libusb', '../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_extra_resources',
'chrome_resources.gyp:chrome_resources', 'chrome_resources.gyp:chrome_resources',
'chrome_resources.gyp:chrome_strings', 'chrome_resources.gyp:chrome_strings',
'chrome_resources.gyp:theme_resources', 'chrome_resources.gyp:theme_resources',
'common/extensions/api/api.gyp:chrome_api', 'common/extensions/api/api.gyp:chrome_api',
], ],
'include_dirs': [
'..',
],
'sources': [ 'sources': [
'browser/devtools/device/adb/adb_client_socket.cc', 'browser/devtools/device/adb/adb_client_socket.cc',
'browser/devtools/device/adb/adb_client_socket.h', 'browser/devtools/device/adb/adb_client_socket.h',
...@@ -55,8 +78,6 @@ ...@@ -55,8 +78,6 @@
'browser/devtools/device/usb/usb_device_provider.h', 'browser/devtools/device/usb/usb_device_provider.h',
'browser/devtools/browser_list_tabcontents_provider.cc', 'browser/devtools/browser_list_tabcontents_provider.cc',
'browser/devtools/browser_list_tabcontents_provider.h', '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.cc',
'browser/devtools/devtools_contents_resizing_strategy.h', 'browser/devtools/devtools_contents_resizing_strategy.h',
'browser/devtools/devtools_embedder_message_dispatcher.cc', 'browser/devtools/devtools_embedder_message_dispatcher.cc',
...@@ -65,18 +86,6 @@ ...@@ -65,18 +86,6 @@
'browser/devtools/devtools_file_helper.h', 'browser/devtools/devtools_file_helper.h',
'browser/devtools/devtools_file_system_indexer.cc', 'browser/devtools/devtools_file_system_indexer.cc',
'browser/devtools/devtools_file_system_indexer.h', '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',
'browser/devtools/devtools_network_controller.h',
'browser/devtools/devtools_network_interceptor.cc',
'browser/devtools/devtools_network_interceptor.h',
'browser/devtools/devtools_network_transaction.cc',
'browser/devtools/devtools_network_transaction.h',
'browser/devtools/devtools_network_transaction_factory.cc',
'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.cc',
'browser/devtools/devtools_target_impl.h', 'browser/devtools/devtools_target_impl.h',
'browser/devtools/devtools_targets_ui.cc', 'browser/devtools/devtools_targets_ui.cc',
...@@ -89,26 +98,8 @@ ...@@ -89,26 +98,8 @@
'browser/devtools/devtools_window.h', 'browser/devtools/devtools_window.h',
'browser/devtools/remote_debugging_server.cc', 'browser/devtools/remote_debugging_server.cc',
'browser/devtools/remote_debugging_server.h', '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!': [
'../third_party/libusb/libusb.gyp:libusb',
], ],
'sources!': [ }], # OS!="android"
'browser/devtools/device/usb/android_rsa.cc',
'browser/devtools/browser_list_tabcontents_provider.cc',
'browser/devtools/devtools_file_system_indexer.cc',
'browser/devtools/devtools_target_impl.cc',
'browser/devtools/devtools_ui_bindings.cc',
'browser/devtools/devtools_window.cc',
'browser/devtools/devtools_window_base.cc',
'browser/devtools/remote_debugging_server.cc',
],
}],
['debug_devtools==1', { ['debug_devtools==1', {
'defines': [ 'defines': [
'DEBUG_DEVTOOLS=1', 'DEBUG_DEVTOOLS=1',
......
chrome/chrome_tests_unit.gypi
View file @ 31cfeb79
...@@ -2582,6 +2582,7 @@ ...@@ -2582,6 +2582,7 @@
'browser/sync/sync_ui_util_unittest.cc', 'browser/sync/sync_ui_util_unittest.cc',
'browser/browser_commands_unittest.cc', 'browser/browser_commands_unittest.cc',
'browser/devtools/devtools_contents_resizing_strategy_unittest.cc',
'browser/download/download_shelf_unittest.cc', 'browser/download/download_shelf_unittest.cc',
'browser/extensions/extension_message_bubble_controller_unittest.cc', 'browser/extensions/extension_message_bubble_controller_unittest.cc',
'browser/extensions/extension_test_message_listener_unittest.cc', 'browser/extensions/extension_test_message_listener_unittest.cc',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment