Index: ui/ui_unittests.gyp |
diff --git a/ui/ui_unittests.gyp b/ui/ui_unittests.gyp |
index a142c7d891d4357a64f5493328f9b237637eabeb..822738e4224b86d34dee04adaff9aabc3467b55c 100644 |
--- a/ui/ui_unittests.gyp |
+++ b/ui/ui_unittests.gyp |
@@ -57,12 +57,28 @@ |
], |
}, |
{ |
+ 'target_name': 'ui_test_dll', |
tony
2014/03/01 00:42:28
Why is this called ui_test_dll? Can it be somethi
tapted
2014/03/03 12:40:40
The `ui_test_dll` name was because it mirrors the
|
+ 'type': 'none', |
+ 'dependencies': [ |
+ 'resources/ui_resources.gyp:ui_test_pak', |
+ ], |
+ 'conditions': [ |
+ ['OS=="mac"', { |
+ 'type': 'shared_library', |
+ 'includes': [ 'ui_unittests_bundle.gypi' ], |
+ }, { # OS!="mac" |
+ 'dependencies': [ |
+ 'base/strings/ui_strings.gyp:ui_unittest_strings', |
+ ], |
+ }], |
+ ], |
+ }, |
+ { |
'target_name': 'ui_unittests', |
'type': '<(gtest_target_type)', |
'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', |
@@ -76,6 +92,7 @@ |
'gfx/gfx.gyp:gfx_test_support', |
'resources/ui_resources.gyp:ui_resources', |
'ui.gyp:ui', |
+ 'ui_test_dll', |
'ui_test_support', |
], |
# iOS uses a small subset of ui. common_sources are the only files that |