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

Unified Diff: ui/ui_unittests.gyp

Issue 496473003: Add ui_unittests to GN build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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 | « ui/base/dragdrop/os_exchange_data_win_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ui_unittests.gyp
diff --git a/ui/ui_unittests.gyp b/ui/ui_unittests.gyp
index b186cd143c75aad490590a15979a5394595a1968..0346f5157a001ff13360c1fbc2f68d9fddc82f9f 100644
--- a/ui/ui_unittests.gyp
+++ b/ui/ui_unittests.gyp
@@ -31,6 +31,7 @@
# iOS uses a small subset of ui. common_sources are the only files that
# are built on iOS.
'common_sources' : [
+ # Note: file list duplicated in GN build.
'base/layout_unittest.cc',
'base/l10n/l10n_util_mac_unittest.mm',
'base/l10n/l10n_util_unittest.cc',
@@ -43,6 +44,7 @@
'base/test/run_all_unittests.cc',
],
'all_sources': [
+ # Note: file list duplicated in GN build.
'<@(_common_sources)',
'base/accelerators/accelerator_manager_unittest.cc',
'base/accelerators/menu_label_accelerator_util_linux_unittest.cc',
@@ -191,11 +193,6 @@
'events/platform/events_platform.gyp:events_platform',
],
}],
- ['use_aura==1', {
- 'sources!': [
- 'base/dragdrop/os_exchange_data_win_unittest.cc',
- ],
- }],
['chromeos==1', {
'dependencies': [
'../chromeos/chromeos.gyp:chromeos',
@@ -211,12 +208,6 @@
'base/x/selection_requestor_unittest.cc',
],
}],
- ['chromeos==0 or use_x11==0', {
- 'sources!': [
- 'base/ime/chromeos/character_composer_unittest.cc',
- 'base/ime/input_method_chromeos_unittest.cc',
- ],
- }],
['use_x11==0', {
'sources!': [
'base/ime/composition_text_util_pango_unittest.cc',
« no previous file with comments | « ui/base/dragdrop/os_exchange_data_win_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698