Index: ui/ui_unittests.gyp |
diff --git a/ui/ui_unittests.gyp b/ui/ui_unittests.gyp |
index a142c7d891d4357a64f5493328f9b237637eabeb..ace720263b19b890d7a379d700db8b22be6b1bd3 100644 |
--- a/ui/ui_unittests.gyp |
+++ b/ui/ui_unittests.gyp |
@@ -62,7 +62,6 @@ |
'dependencies': [ |
'../base/base.gyp:base', |
'../base/base.gyp:test_support_base', |
- '../chrome/chrome_resources.gyp:packed_resources', |
'../skia/skia.gyp:skia', |
'../testing/gmock.gyp:gmock', |
'../testing/gtest.gyp:gtest', |
@@ -285,6 +284,11 @@ |
'dependencies': [ |
'events/events.gyp:events_test_support', |
'gfx/gfx.gyp:gfx_test_support', |
+ 'ui_unittests_bundle', |
+ ], |
+ }, { # OS!="mac" |
+ 'dependencies': [ |
+ 'base/strings/ui_strings.gyp:ui_unittest_strings', |
], |
}], |
['use_aura==1 or toolkit_views==1', { |
@@ -335,6 +339,19 @@ |
}, |
], |
'conditions': [ |
+ # Mac target to build a test Framework bundle to mock out resource loading. |
+ ['OS == "mac"', { |
+ 'targets': [ |
+ { |
+ 'target_name': 'ui_unittests_bundle', |
+ 'type': 'shared_library', |
+ 'dependencies': [ |
+ 'resources/ui_resources.gyp:ui_test_pak', |
+ ], |
+ 'includes': [ 'ui_unittests_bundle.gypi' ], |
tfarina
2014/03/05 18:39:31
Trent, instead of going with a gyp include file, p
tapted
2014/03/05 23:03:26
I think that would have a negative impact. 10 leve
|
+ }, |
+ ], |
+ }], |
# Special target to wrap a gtest_target_type==shared_library |
# ui_unittests into an android apk for execution. |
# See base.gyp for TODO(jrg)s about this strategy. |