Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(137)

Unified Diff: ui/ui_unittests.gypi

Issue 16841013: Have the ui_test_support target be of type none on iOS. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ui_unittests.gypi
diff --git a/ui/ui_unittests.gypi b/ui/ui_unittests.gypi
index 32335d8753c6707505ab96dfddd545894f6b2ab0..b6fa266198468df6608c3ac40a429cd38809a026 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']],
}],
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698