diff options
| author | blundell@chromium.org <blundell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-13 20:00:10 +0000 |
|---|---|---|
| committer | blundell@chromium.org <blundell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-13 20:00:10 +0000 |
| commit | 9559f2c9c5a2760fd3ba291eae6f3fd5c7e921a4 (patch) | |
| tree | 657da9d1ced7cc2470e1f2fa2324e5f4f1a8c3c0 /ui/ui_unittests.gypi | |
| parent | 58ce4687bbf2c0a339b45a6181103b2d2bb0ae70 (diff) | |
| download | chromium_src-9559f2c9c5a2760fd3ba291eae6f3fd5c7e921a4.zip chromium_src-9559f2c9c5a2760fd3ba291eae6f3fd5c7e921a4.tar.gz chromium_src-9559f2c9c5a2760fd3ba291eae6f3fd5c7e921a4.tar.bz2 | |
Have the ui_test_support target be of type none on iOS.
After https://chromiumcodereview.appspot.com/16024014, the ui_test_support
target has no sources that are built on iOS. This causes targets that depend on
this target to fail linkage because the ui_test_support library can't be found.
R=thakis
Review URL: https://chromiumcodereview.appspot.com/16841013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206147 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/ui_unittests.gypi')
| -rw-r--r-- | ui/ui_unittests.gypi | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/ui/ui_unittests.gypi b/ui/ui_unittests.gypi index 32335d8..b6fa266 100644 --- a/ui/ui_unittests.gypi +++ b/ui/ui_unittests.gypi @@ -6,7 +6,6 @@ 'targets': [ { 'target_name': 'ui_test_support', - 'type': 'static_library', 'dependencies': [ '../base/base.gyp:base', '../skia/skia.gyp:skia', @@ -30,8 +29,15 @@ ], 'conditions': [ ['OS!="ios"', { + 'type': 'static_library', 'includes': [ 'base/ime/ime_test_support.gypi' ], }, { # OS=="ios" + # None of the sources in this target are built on iOS, resulting in + # link errors when building targets that depend on this target + # because the static library isn't found. If this target is changed + # to have sources that are built on iOS, the target should be changed + # to be of type static_library on all platforms. + 'type': 'none', # The cocoa files don't apply to iOS. 'sources/': [['exclude', 'cocoa']], }], |