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

Side by Side Diff: athena/main/athena_main.gyp

Issue 402643003: Include athena_resource in unit tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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
« no previous file with comments | « athena/athena.gyp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
11 'target_name': 'athena_main', 11 'target_name': 'athena_main',
12 'type': 'executable', 12 'type': 'executable',
13 'dependencies': [ 13 'dependencies': [
14 '../athena.gyp:athena_lib', 14 '../athena.gyp:athena_lib',
15 '../athena.gyp:athena_content_lib', 15 '../athena.gyp:athena_content_lib',
16 '../resources/athena_resources.gyp:athena_resources', 16 '../resources/athena_resources.gyp:athena_resources',
17 '../../apps/shell/app_shell.gyp:app_shell_lib', 17 '../../apps/shell/app_shell.gyp:app_shell_lib',
18 # debug_widow.cc depends on this. Remove this once debug_window
Albert Bodenhamer 2014/07/17 16:05:47 This comment makes sense, but it's not clear to me
19 # is removed.
18 '../../ash/ash_resources.gyp:ash_resources', 20 '../../ash/ash_resources.gyp:ash_resources',
19 '../../chromeos/chromeos.gyp:power_manager_proto', 21 '../../chromeos/chromeos.gyp:power_manager_proto',
20 '../../components/components.gyp:autocomplete', 22 '../../components/components.gyp:autocomplete',
21 '../../components/components.gyp:component_metrics_proto', 23 '../../components/components.gyp:component_metrics_proto',
22 '../../components/components.gyp:history_core_browser', 24 '../../components/components.gyp:history_core_browser',
23 # infobars_test_support is required to declare some symbols used in the 25 # infobars_test_support is required to declare some symbols used in the
24 # search_engines and its dependencies. See crbug.com/386171 26 # search_engines and its dependencies. See crbug.com/386171
25 # TODO(mukai): declare those symbols for Athena. 27 # TODO(mukai): declare those symbols for Athena.
26 '../../components/components.gyp:infobars_test_support', 28 '../../components/components.gyp:infobars_test_support',
27 '../../components/components.gyp:search_engines', 29 '../../components/components.gyp:search_engines',
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 '../../ui/resources/ui_resources.gyp:ui_test_pak', 65 '../../ui/resources/ui_resources.gyp:ui_test_pak',
64 '../athena.gyp:athena_lib', 66 '../athena.gyp:athena_lib',
65 '../athena.gyp:athena_test_support', 67 '../athena.gyp:athena_test_support',
66 ], 68 ],
67 'sources': [ 69 'sources': [
68 'athena_shell.cc', 70 'athena_shell.cc',
69 ], 71 ],
70 } 72 }
71 ], # targets 73 ], # targets
72 } 74 }
OLDNEW
« no previous file with comments | « athena/athena.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698