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

Unified Diff: ui/ui_unittests.gypi

Issue 10928093: Adds an iOS implementation of gfx::Image. (Closed) Base URL: http://git.chromium.org/chromium/src.git@skia
Patch Set: Cleanup. Created 8 years, 3 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
« ui/gfx/image/image_util_ios.mm ('K') | « ui/ui.gyp ('k') | 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 17088c2d9092ba749662ffa48d8a3c3432e8ae9d..3e0d55dafedc242dc04d53bd79a4d27fc28bc44c 100644
--- a/ui/ui_unittests.gypi
+++ b/ui/ui_unittests.gypi
@@ -58,6 +58,11 @@
# are built on iOS.
'common_sources' : [
'base/models/tree_node_iterator_unittest.cc',
+ 'gfx/image/image_skia_unittest.cc',
+ 'gfx/image/image_unittest.cc',
+ 'gfx/image/image_unittest_util.cc',
+ 'gfx/image/image_unittest_util.h',
+ 'gfx/image/image_unittest_util_mac.mm',
'gfx/insets_unittest.cc',
],
'all_sources': [
@@ -105,11 +110,6 @@
'gfx/font_list_unittest.cc',
'gfx/font_unittest.cc',
'gfx/image/image_mac_unittest.mm',
- 'gfx/image/image_skia_unittest.cc',
- 'gfx/image/image_unittest.cc',
- 'gfx/image/image_unittest_util.cc',
- 'gfx/image/image_unittest_util.h',
- 'gfx/image/image_unittest_util_mac.mm',
'gfx/image/image_util_unittest.cc',
'gfx/rect_unittest.cc',
'gfx/render_text_unittest.cc',
@@ -133,9 +133,9 @@
'base/ime/ime_unittests.gypi',
],
}, { # OS=="ios"
- 'sources' : ['<@(_common_sources)'],
- 'dependencies' : [
- '../testing/gtest.gyp:gtest_main',
+ 'sources' : [
+ '<@(_common_sources)',
+ '../base/test/run_all_unittests.cc',
],
}],
['OS == "win"', {
« ui/gfx/image/image_util_ios.mm ('K') | « ui/ui.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698