diff options
author | sdefresne <sdefresne@chromium.org> | 2015-02-26 01:44:53 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-02-26 09:45:28 +0000 |
commit | 3e96329f442c10d73174688a4786ab847a49a37f (patch) | |
tree | 75543f1de02d1ab72c065555cc3e638828b7444f /components | |
parent | 5498961861c9072067d94751d9f79f622c045caf (diff) | |
download | chromium_src-3e96329f442c10d73174688a4786ab847a49a37f.zip chromium_src-3e96329f442c10d73174688a4786ab847a49a37f.tar.gz chromium_src-3e96329f442c10d73174688a4786ab847a49a37f.tar.bz2 |
Remove dependency on //components/feedback on iOS
iOS does not use //components/feedback to report feedback so remove
the unused dependencies.
BUG=None
Review URL: https://codereview.chromium.org/954943004
Cr-Commit-Position: refs/heads/master@{#318211}
Diffstat (limited to 'components')
-rw-r--r-- | components/BUILD.gn | 3 | ||||
-rw-r--r-- | components/components.gyp | 6 | ||||
-rw-r--r-- | components/components_tests.gyp | 15 |
3 files changed, 7 insertions, 17 deletions
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', ], }], |