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

Unified Diff: ui/ui_unittests.gyp

Issue 152543005: Introduce a mock ui_unittests Framework for loading resources. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: More tests passing Created 6 years, 10 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
Index: ui/ui_unittests.gyp
diff --git a/ui/ui_unittests.gyp b/ui/ui_unittests.gyp
index 244cad345d79e660c7096b936a099e5be7df1a62..aa5a38a4d1bd611c653a9ef7cd8cfb56db181d3c 100644
--- a/ui/ui_unittests.gyp
+++ b/ui/ui_unittests.gyp
@@ -59,12 +59,24 @@
],
},
{
+ 'target_name': 'ui_test_dll',
+ 'type': 'none',
+ 'dependencies': [
+ 'resources/ui_resources.gyp:ui_test_pak',
+ ],
+ 'conditions': [
+ ['OS=="mac"', {
+ 'type': 'shared_library',
+ 'includes': [ 'ui_unittests_bundle.gypi' ],
+ }],
+ ],
+ },
+ {
'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',
@@ -79,6 +91,7 @@
'resources/ui_resources.gyp:ui_resources',
'shell_dialogs/shell_dialogs.gyp:shell_dialogs',
'ui.gyp:ui',
+ 'ui_test_dll',
'ui_test_support',
],
# iOS uses a small subset of ui. common_sources are the only files that

Powered by Google App Engine
This is Rietveld 408576698