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

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

Issue 497013002: Revert 291221 "Athena: Adding basic resource management framewor..." (Closed) Base URL: svn://svn.chromium.org/chrome/
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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « trunk/src/athena/main/athena_launcher.cc ('k') | trunk/src/athena/test/DEPS » ('j') | 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_lib', 11 'target_name': 'athena_main_lib',
12 'type': 'static_library', 12 'type': 'static_library',
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 '../athena.gyp:athena_content_support_lib',
17 '../resources/athena_resources.gyp:athena_resources', 16 '../resources/athena_resources.gyp:athena_resources',
18 # debug_widow.cc depends on this. Remove this once debug_window 17 # debug_widow.cc depends on this. Remove this once debug_window
19 # is removed. 18 # is removed.
20 '../../ash/ash_resources.gyp:ash_resources', 19 '../../ash/ash_resources.gyp:ash_resources',
21 '../../chromeos/chromeos.gyp:power_manager_proto', 20 '../../chromeos/chromeos.gyp:power_manager_proto',
22 '../../components/components.gyp:component_metrics_proto', 21 '../../components/components.gyp:component_metrics_proto',
23 '../../components/components.gyp:history_core_browser', 22 '../../components/components.gyp:history_core_browser',
24 # infobars_test_support is required to declare some symbols used in the 23 # infobars_test_support is required to declare some symbols used in the
25 # search_engines and its dependencies. See crbug.com/386171 24 # search_engines and its dependencies. See crbug.com/386171
26 # TODO(mukai): declare those symbols for Athena. 25 # TODO(mukai): declare those symbols for Athena.
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 ], 63 ],
65 'include_dirs': [ 64 'include_dirs': [
66 '../..', 65 '../..',
67 ], 66 ],
68 'sources': [ 67 'sources': [
69 'athena_main.cc', 68 'athena_main.cc',
70 ], 69 ],
71 } 70 }
72 ], # targets 71 ], # targets
73 } 72 }
OLDNEW
« no previous file with comments | « trunk/src/athena/main/athena_launcher.cc ('k') | trunk/src/athena/test/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698