diff options
-rw-r--r-- | chrome/browser/BUILD.gn | 3 | ||||
-rw-r--r-- | chrome/browser/ui/BUILD.gn | 3 | ||||
-rw-r--r-- | chrome/chrome_browser.gypi | 3 | ||||
-rw-r--r-- | chrome/chrome_browser_ui.gypi | 3 | ||||
-rw-r--r-- | components/BUILD.gn | 3 | ||||
-rw-r--r-- | components/components.gyp | 6 | ||||
-rw-r--r-- | components/components_tests.gyp | 15 |
7 files changed, 11 insertions, 25 deletions
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn index ce8af0f..975c68c 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn @@ -93,7 +93,6 @@ static_library("browser") { "//components/enhanced_bookmarks", "//components/favicon_base", "//components/favicon/core", - "//components/feedback", "//components/gcm_driver", "//components/google/core/browser", "//components/handoff", @@ -583,6 +582,7 @@ static_library("browser") { ".", "//chrome") deps += [ + "//components/feedback", "//device/core", "//device/usb", ] @@ -603,7 +603,6 @@ static_library("browser") { ] deps -= [ "//third_party/libaddressinput", - "//components/feedback", "//components/storage_monitor", "//components/web_modal", ] diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn index 06fbfa4..bb97512 100644 --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn @@ -47,7 +47,6 @@ static_library("ui") { "//components/app_modal", "//components/auto_login_parser", "//components/dom_distiller/webui", - "//components/feedback/proto", "//components/history/core/browser:proto", "//components/invalidation", "//components/onc", @@ -135,6 +134,7 @@ static_library("ui") { "//chrome") deps += [ "//components/copresence", + "//components/feedback/proto", "//device/bluetooth", "//third_party/libusb", ] @@ -314,7 +314,6 @@ static_library("ui") { ] deps -= [ "//chrome/browser/ui/views", - "//components/feedback/proto", "//ui/events", ] sources += rebase_path(gypi_values.chrome_browser_ui_android_sources, diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 550ede1..47c5b7e 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -2894,7 +2894,6 @@ '../components/components.gyp:enhanced_bookmarks', '../components/components.gyp:favicon_base', '../components/components.gyp:favicon_core', - '../components/components.gyp:feedback_component', '../components/components.gyp:gcm_driver', '../components/components.gyp:google_core_browser', '../components/components.gyp:handoff', @@ -3365,6 +3364,7 @@ }, { # OS!="android" and OS!="ios" 'sources': [ '<@(chrome_browser_non_mobile_sources)' ], 'dependencies': [ + '../components/components.gyp:feedback_component', '../device/core/core.gyp:device_core', '../device/usb/usb.gyp:device_usb', ] @@ -3381,7 +3381,6 @@ 'chrome_browser_jni_headers', ], 'dependencies!': [ - '../components/components.gyp:feedback_component', '../components/components.gyp:storage_monitor', '../components/components.gyp:web_modal', '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput', diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi index 5cb184b..28e210e 100644 --- a/chrome/chrome_browser_ui.gypi +++ b/chrome/chrome_browser_ui.gypi @@ -2668,7 +2668,6 @@ '../components/components.gyp:device_event_log_component', '../components/components.gyp:dom_distiller_core', '../components/components.gyp:dom_distiller_webui', - '../components/components.gyp:feedback_proto', '../components/components.gyp:history_core_browser_proto', '../components/components.gyp:invalidation', '../components/components.gyp:onc_component', @@ -2929,7 +2928,6 @@ 'chrome_browser_jni_headers', ], 'dependencies!': [ - '../components/components.gyp:feedback_proto', '../ui/events/events.gyp:events', 'chrome_browser_ui_views.gyp:browser_ui_views', ], @@ -3126,6 +3124,7 @@ }], ['OS!="android" and OS!="ios"', { 'dependencies': [ + '../components/components.gyp:feedback_proto', '../device/bluetooth/bluetooth.gyp:device_bluetooth', '../third_party/libusb/libusb.gyp:libusb', ], diff --git a/components/BUILD.gn b/components/BUILD.gn index 7312e28..9740999 100644 --- a/components/BUILD.gn +++ b/components/BUILD.gn @@ -39,7 +39,6 @@ group("all_components") { "//components/enhanced_bookmarks", "//components/favicon/core", "//components/favicon_base", - "//components/feedback", "//components/gcm_driver", "//components/google/core/browser", "//components/history/content/browser", @@ -157,7 +156,6 @@ group("all_components") { "//components/domain_reliability", # Blocked on content. "//components/favicon_base", # Should work, needs checking. "//components/favicon/core", # Blocked on keyed service. - "//components/feedback", # Blocked on content. "//components/gcm_driver", # Should work, needs checking. "//components/google/core/browser", # Should work, needs checking. "//components/history/core/browser", # Should work, needs checking. @@ -199,6 +197,7 @@ group("all_components") { if (!is_ios && !is_android) { deps += [ "//components/copresence", + "//components/feedback", "//components/storage_monitor", ] } diff --git a/components/components.gyp b/components/components.gyp index db6d9b0..17e4235 100644 --- a/components/components.gyp +++ b/components/components.gyp @@ -88,15 +88,11 @@ 'webp_transcode.gypi', ], }], - ['OS != "android"', { - 'includes': [ - 'feedback.gypi', - ] - }], ['OS != "ios" and OS != "android"', { 'includes': [ 'audio_modem.gypi', 'copresence.gypi', + 'feedback.gypi', 'proximity_auth.gypi', 'storage_monitor.gypi', ] diff --git a/components/components_tests.gyp b/components/components_tests.gyp index a692b05..ca9b112 100644 --- a/components/components_tests.gyp +++ b/components/components_tests.gyp @@ -164,10 +164,6 @@ 'enhanced_bookmarks/image_store_ios_unittest.mm', 'enhanced_bookmarks/image_store_unittest.cc', 'enhanced_bookmarks/item_position_unittest.cc', - 'feedback/feedback_common_unittest.cc', - 'feedback/feedback_data_unittest.cc', - 'feedback/feedback_uploader_chrome_unittest.cc', - 'feedback/feedback_uploader_unittest.cc', 'gcm_driver/gcm_account_mapper_unittest.cc', 'gcm_driver/gcm_channel_status_request_unittest.cc', 'gcm_driver/gcm_client_impl_unittest.cc', @@ -401,7 +397,6 @@ 'components.gyp:enhanced_bookmarks', 'components.gyp:enhanced_bookmarks_test_support', 'components.gyp:favicon_base', - 'components.gyp:feedback_component', 'components.gyp:gcm_driver', 'components.gyp:gcm_driver_test_support', 'components.gyp:google_core_browser', @@ -639,10 +634,6 @@ 'invalidation/invalidation_service_android_unittest.cc', ], 'sources!': [ - 'feedback/feedback_common_unittest.cc', - 'feedback/feedback_data_unittest.cc', - 'feedback/feedback_uploader_chrome_unittest.cc', - 'feedback/feedback_uploader_unittest.cc', 'gcm_driver/gcm_account_mapper_unittest.cc', 'gcm_driver/gcm_channel_status_request_unittest.cc', 'gcm_driver/gcm_client_impl_unittest.cc', @@ -660,7 +651,6 @@ '../testing/android/native_test.gyp:native_test_native_code', ], 'dependencies!': [ - 'components.gyp:feedback_component', 'components.gyp:storage_monitor', 'components.gyp:storage_monitor_test_support', 'components.gyp:web_modal', @@ -698,6 +688,10 @@ 'copresence/rpc/http_post_unittest.cc', 'copresence/rpc/rpc_handler_unittest.cc', 'copresence/timed_map_unittest.cc', + 'feedback/feedback_common_unittest.cc', + 'feedback/feedback_data_unittest.cc', + 'feedback/feedback_uploader_chrome_unittest.cc', + 'feedback/feedback_uploader_unittest.cc', 'proximity_auth/base64url_unittest.cc', 'proximity_auth/bluetooth_connection_finder_unittest.cc', 'proximity_auth/bluetooth_connection_unittest.cc', @@ -719,6 +713,7 @@ 'components.gyp:copresence', 'components.gyp:copresence_test_support', 'components.gyp:cryptauth', + 'components.gyp:feedback_component', 'components.gyp:proximity_auth', ], }], |