summaryrefslogtreecommitdiffstats
path: root/components/component_updater.gypi
diff options
context:
space:
mode:
authortommycli <tommycli@chromium.org>2014-09-10 10:09:58 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-10 17:14:49 +0000
commit43754386adfac6ca796478cd0b68947a8be599cb (patch)
treedf3b7fb4a4bf8bdce4aeba6f78e29e44233db7ce /components/component_updater.gypi
parent8e369096567e079d70bd87ac1e4fad4f58c8fbec (diff)
downloadchromium_src-43754386adfac6ca796478cd0b68947a8be599cb.zip
chromium_src-43754386adfac6ca796478cd0b68947a8be599cb.tar.gz
chromium_src-43754386adfac6ca796478cd0b68947a8be599cb.tar.bz2
Componentize component_updater: Enable tests on iOS.
BUG=371463 Review URL: https://codereview.chromium.org/555523003 Cr-Commit-Position: refs/heads/master@{#294184}
Diffstat (limited to 'components/component_updater.gypi')
-rw-r--r--components/component_updater.gypi41
1 files changed, 17 insertions, 24 deletions
diff --git a/components/component_updater.gypi b/components/component_updater.gypi
index d60d0fb..d0a0eba 100644
--- a/components/component_updater.gypi
+++ b/components/component_updater.gypi
@@ -57,30 +57,23 @@
'component_updater/url_fetcher_downloader.h',
],
},
- ],
-
- 'conditions': [
- ['OS != "ios"', {
- 'targets': [
- {
- # GN version: //components/component_updater:test_support
- 'target_name': 'component_updater_test_support',
- 'type': 'static_library',
- 'dependencies': [
- 'component_updater',
- '../testing/gmock.gyp:gmock',
- '../testing/gtest.gyp:gtest',
- ],
- 'sources': [
- 'component_updater/test/test_configurator.cc',
- 'component_updater/test/test_configurator.h',
- 'component_updater/test/test_installer.cc',
- 'component_updater/test/test_installer.h',
- 'component_updater/test/url_request_post_interceptor.cc',
- 'component_updater/test/url_request_post_interceptor.h',
- ],
- },
+ {
+ # GN version: //components/component_updater:test_support
+ 'target_name': 'component_updater_test_support',
+ 'type': 'static_library',
+ 'dependencies': [
+ 'component_updater',
+ '../testing/gmock.gyp:gmock',
+ '../testing/gtest.gyp:gtest',
+ ],
+ 'sources': [
+ 'component_updater/test/test_configurator.cc',
+ 'component_updater/test/test_configurator.h',
+ 'component_updater/test/test_installer.cc',
+ 'component_updater/test/test_installer.h',
+ 'component_updater/test/url_request_post_interceptor.cc',
+ 'component_updater/test/url_request_post_interceptor.h',
],
- }],
+ },
],
}