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

Side by Side Diff: ash/ash.gyp

Issue 230763004: Split ui/display types into separate module and have Ozone depend on it (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: display_types has ony CrOS, so include it only if chromeos==1 Created 6 years, 8 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', 8 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
9 }, 9 },
10 'includes': [ 10 'includes': [
(...skipping 1050 matching lines...) Expand 10 before | Expand all | Expand 10 after
1061 ['exclude', 'accelerators/magnifier_key_scroller_unittest.cc'], 1061 ['exclude', 'accelerators/magnifier_key_scroller_unittest.cc'],
1062 ['exclude', 'accelerators/spoken_feedback_toggler_unittest.cc'], 1062 ['exclude', 'accelerators/spoken_feedback_toggler_unittest.cc'],
1063 ], 1063 ],
1064 }], 1064 }],
1065 ['chromeos==1', { 1065 ['chromeos==1', {
1066 'dependencies': [ 1066 'dependencies': [
1067 '../chromeos/chromeos.gyp:power_manager_proto', 1067 '../chromeos/chromeos.gyp:power_manager_proto',
1068 '../device/bluetooth/bluetooth.gyp:device_bluetooth', 1068 '../device/bluetooth/bluetooth.gyp:device_bluetooth',
1069 '../ui/display/display.gyp:display', 1069 '../ui/display/display.gyp:display',
1070 '../ui/display/display.gyp:display_test_util', 1070 '../ui/display/display.gyp:display_test_util',
1071 '../ui/display/display.gyp:display_types',
rjkroege 2014/04/11 21:53:09 this is redundant as it comes from display?
dnicoara 2014/04/14 14:43:03 This is needed since 'display' doesn't export its
1071 ], 1072 ],
1072 'sources': [ 1073 'sources': [
1073 'first_run/first_run_helper_unittest.cc', 1074 'first_run/first_run_helper_unittest.cc',
1074 ], 1075 ],
1075 }, { # else: chromeos!=1 1076 }, { # else: chromeos!=1
1076 'sources/': [ 1077 'sources/': [
1077 ['exclude', 'display/resolution_notification_controller_unittest.cc' ], 1078 ['exclude', 'display/resolution_notification_controller_unittest.cc' ],
1078 ], 1079 ],
1079 }], 1080 }],
1080 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 1081 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
1170 }], 1171 }],
1171 ['chromeos==1', { 1172 ['chromeos==1', {
1172 'dependencies': [ 1173 'dependencies': [
1173 '../device/bluetooth/bluetooth.gyp:device_bluetooth', 1174 '../device/bluetooth/bluetooth.gyp:device_bluetooth',
1174 ], 1175 ],
1175 }], 1176 }],
1176 ], 1177 ],
1177 }, 1178 },
1178 ], 1179 ],
1179 } 1180 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698