diff options
author | sdefresne <sdefresne@chromium.org> | 2015-03-02 02:33:08 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-03-02 10:33:38 +0000 |
commit | 4fb46b5b522e018429b2e40cf5f1c037c3ebbe19 (patch) | |
tree | 4c3dcc6a260f774893bae64c72373720c223ea64 /components | |
parent | 8747aee1f18410d8eaf0e2d98724c8e24477bdc2 (diff) | |
download | chromium_src-4fb46b5b522e018429b2e40cf5f1c037c3ebbe19.zip chromium_src-4fb46b5b522e018429b2e40cf5f1c037c3ebbe19.tar.gz chromium_src-4fb46b5b522e018429b2e40cf5f1c037c3ebbe19.tar.bz2 |
Revert of Remove dependency on //components/feedback on iOS (patchset #1 id:1 of https://codereview.chromium.org/954943004/)
Reason for revert:
This CL cause the test to run in another order, causing a hidden dependency on the ordering to be visible. Reverting as this cause test failures.
See http://crbug.com/462352
Original issue's description:
> Remove dependency on //components/feedback on iOS
>
> iOS does not use //components/feedback to report feedback so remove
> the unused dependencies.
>
> BUG=None
>
> Committed: https://crrev.com/3e96329f442c10d73174688a4786ab847a49a37f
> Cr-Commit-Position: refs/heads/master@{#318211}
TBR=thakis@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=None
Review URL: https://codereview.chromium.org/968653004
Cr-Commit-Position: refs/heads/master@{#318674}
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, 17 insertions, 7 deletions
diff --git a/components/BUILD.gn b/components/BUILD.gn index 95b02c9..d7cd5cf 100644 --- a/components/BUILD.gn +++ b/components/BUILD.gn @@ -40,6 +40,7 @@ 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", @@ -161,6 +162,7 @@ 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. @@ -202,7 +204,6 @@ 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 17e4235..db6d9b0 100644 --- a/components/components.gyp +++ b/components/components.gyp @@ -88,11 +88,15 @@ '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 4f44e2b..3ab640f 100644 --- a/components/components_tests.gyp +++ b/components/components_tests.gyp @@ -165,6 +165,10 @@ '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', @@ -397,6 +401,7 @@ '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', @@ -634,6 +639,10 @@ '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', @@ -651,6 +660,7 @@ '../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', @@ -688,10 +698,6 @@ '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', @@ -713,7 +719,6 @@ 'components.gyp:copresence', 'components.gyp:copresence_test_support', 'components.gyp:cryptauth', - 'components.gyp:feedback_component', 'components.gyp:proximity_auth', ], }], |