summaryrefslogtreecommitdiffstats
path: root/components/components_tests.gyp
diff options
context:
space:
mode:
authorsdefresne <sdefresne@chromium.org>2016-02-04 10:10:50 -0800
committerCommit bot <commit-bot@chromium.org>2016-02-04 18:11:51 +0000
commit047d132d6c201b9dacbd1459516a161d454b44dc (patch)
treeb2c66924172de6b0e72adeccd4a27b471fe893b0 /components/components_tests.gyp
parentd3d8cfdb47fe445ae23f6eafc90f977e6f50a8b9 (diff)
downloadchromium_src-047d132d6c201b9dacbd1459516a161d454b44dc.zip
chromium_src-047d132d6c201b9dacbd1459516a161d454b44dc.tar.gz
chromium_src-047d132d6c201b9dacbd1459516a161d454b44dc.tar.bz2
Stop building components depending on content/ on iOS.
Chrome on iOS cannot use content/ so remove from the compilation all components that depend on content. Remove dependencies on chrome/chrome.gyp and content/content.gyp from build/all.gyp on iOS and add another mojo target that should be built on iOS. BUG=None Review URL: https://codereview.chromium.org/1670593002 Cr-Commit-Position: refs/heads/master@{#373564}
Diffstat (limited to 'components/components_tests.gyp')
-rw-r--r--components/components_tests.gyp4
1 files changed, 2 insertions, 2 deletions
diff --git a/components/components_tests.gyp b/components/components_tests.gyp
index 22c52b8..9a9356f 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -928,7 +928,6 @@
'<@(bubble_unittest_sources)',
'<@(captive_portal_unittest_sources)',
'<@(certificate_reporting_unittest_sources)',
- '<@(child_trace_message_filter_unittest_sources)',
'<@(cloud_devices_unittest_sources)',
'<@(component_updater_unittest_sources)',
'<@(content_settings_unittest_sources)',
@@ -1115,7 +1114,6 @@
'components.gyp:translate_core_browser',
'components.gyp:translate_core_common',
'components.gyp:translate_core_language_detection',
- 'components.gyp:ui_zoom',
'components.gyp:undo_component',
'components.gyp:update_client',
'components.gyp:update_client_test_support',
@@ -1185,6 +1183,7 @@
['OS != "ios"', {
'sources': [
'<@(certificate_transparency_unittest_sources)',
+ '<@(child_trace_message_filter_unittest_sources)',
'<@(devtools_http_handler_unittest_sources)',
'<@(error_page_unittest_sources)',
'<@(guest_view_unittest_sources)',
@@ -1241,6 +1240,7 @@
'components.gyp:sessions_content',
'components.gyp:storage_monitor',
'components.gyp:storage_monitor_test_support',
+ 'components.gyp:ui_zoom',
'components.gyp:url_matcher',
'components.gyp:visitedlink_browser',
'components.gyp:visitedlink_renderer',