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

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: Rebased 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 1056 matching lines...) Expand 10 before | Expand all | Expand 10 after
1067 ['exclude', 'accelerators/magnifier_key_scroller_unittest.cc'], 1067 ['exclude', 'accelerators/magnifier_key_scroller_unittest.cc'],
1068 ['exclude', 'accelerators/spoken_feedback_toggler_unittest.cc'], 1068 ['exclude', 'accelerators/spoken_feedback_toggler_unittest.cc'],
1069 ], 1069 ],
1070 }], 1070 }],
1071 ['chromeos==1', { 1071 ['chromeos==1', {
1072 'dependencies': [ 1072 'dependencies': [
1073 '../chromeos/chromeos.gyp:power_manager_proto', 1073 '../chromeos/chromeos.gyp:power_manager_proto',
1074 '../device/bluetooth/bluetooth.gyp:device_bluetooth', 1074 '../device/bluetooth/bluetooth.gyp:device_bluetooth',
1075 '../ui/display/display.gyp:display', 1075 '../ui/display/display.gyp:display',
1076 '../ui/display/display.gyp:display_test_util', 1076 '../ui/display/display.gyp:display_test_util',
1077 '../ui/display/display.gyp:display_types',
1077 ], 1078 ],
1078 'sources': [ 1079 'sources': [
1079 'first_run/first_run_helper_unittest.cc', 1080 'first_run/first_run_helper_unittest.cc',
1080 ], 1081 ],
1081 }, { # else: chromeos!=1 1082 }, { # else: chromeos!=1
1082 'sources/': [ 1083 'sources/': [
1083 ['exclude', 'display/resolution_notification_controller_unittest.cc' ], 1084 ['exclude', 'display/resolution_notification_controller_unittest.cc' ],
1084 ], 1085 ],
1085 }], 1086 }],
1086 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 1087 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
1181 }], 1182 }],
1182 ['chromeos==1', { 1183 ['chromeos==1', {
1183 'dependencies': [ 1184 'dependencies': [
1184 '../device/bluetooth/bluetooth.gyp:device_bluetooth', 1185 '../device/bluetooth/bluetooth.gyp:device_bluetooth',
1185 ], 1186 ],
1186 }], 1187 }],
1187 ], 1188 ],
1188 }, 1189 },
1189 ], 1190 ],
1190 } 1191 }
OLDNEW
« no previous file with comments | « apps/shell/browser/shell_desktop_controller.cc ('k') | ash/display/display_change_observer_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698