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

Side by Side Diff: content/content_app.gypi

Issue 187183002: Add creation of ServiceManager to Content (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge problem Created 6 years, 9 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 | « content/common/mojo/mojo_channel_init.cc ('k') | content/content_common.gypi » ('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 (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 'include_dirs': [ 6 'include_dirs': [
7 '..', 7 '..',
8 ], 8 ],
9 'dependencies': [ 9 'dependencies': [
10 '../base/base.gyp:base', 10 '../base/base.gyp:base',
11 '../base/base.gyp:base_i18n', 11 '../base/base.gyp:base_i18n',
12 '../crypto/crypto.gyp:crypto', 12 '../crypto/crypto.gyp:crypto',
13 '../ui/base/ui_base.gyp:ui_base', 13 '../ui/base/ui_base.gyp:ui_base',
14 '../ui/gfx/gfx.gyp:gfx', 14 '../ui/gfx/gfx.gyp:gfx',
15 '../ui/gfx/gfx.gyp:gfx_geometry', 15 '../ui/gfx/gfx.gyp:gfx_geometry',
16 ], 16 ],
17 'sources': [ 17 'sources': [
18 'app/android/app_jni_registrar.cc', 18 'app/android/app_jni_registrar.cc',
19 'app/android/app_jni_registrar.h', 19 'app/android/app_jni_registrar.h',
20 'app/android/child_process_service.cc', 20 'app/android/child_process_service.cc',
21 'app/android/child_process_service.h', 21 'app/android/child_process_service.h',
22 'app/android/content_main.cc', 22 'app/android/content_main.cc',
23 'app/android/content_main.h', 23 'app/android/content_main.h',
24 'app/android/library_loader_hooks.cc', 24 'app/android/library_loader_hooks.cc',
25 'app/content_main.cc', 25 'app/content_main.cc',
26 'app/content_main_runner.cc', 26 'app/content_main_runner.cc',
27 'app/mojo/mojo_init.cc',
28 'app/mojo/mojo_init.h',
27 'app/startup_helper_win.cc', 29 'app/startup_helper_win.cc',
28 'public/app/android_library_loader_hooks.h', 30 'public/app/android_library_loader_hooks.h',
29 'public/app/content_main.h', 31 'public/app/content_main.h',
30 'public/app/content_main_delegate.cc', 32 'public/app/content_main_delegate.cc',
31 'public/app/content_main_delegate.h', 33 'public/app/content_main_delegate.h',
32 'public/app/content_main_runner.h', 34 'public/app/content_main_runner.h',
33 'public/app/startup_helper_win.h', 35 'public/app/startup_helper_win.h',
34 ], 36 ],
35 'conditions': [ 37 'conditions': [
36 ['OS=="win"', { 38 ['OS=="win"', {
(...skipping 11 matching lines...) Expand all
48 ], 50 ],
49 'includes': [ 51 'includes': [
50 '../build/android/cpufeatures.gypi', 52 '../build/android/cpufeatures.gypi',
51 ], 53 ],
52 }], 54 }],
53 ['OS=="ios"', { 55 ['OS=="ios"', {
54 'sources!': [ 56 'sources!': [
55 'app/content_main.cc', 57 'app/content_main.cc',
56 ], 58 ],
57 }], 59 }],
60 ['use_mojo==0', {
61 'sources!': [
62 'app/mojo/mojo_init.cc',
63 'app/mojo/mojo_init.h',
64 ],
65 }, {
66 'dependencies': [
67 '../mojo/mojo.gyp:mojo_environment_chromium',
68 '../mojo/mojo.gyp:mojo_service_manager',
69 '../mojo/mojo.gyp:mojo_system',
70 '../mojo/mojo.gyp:mojo_system_impl',
71 ],
72 }],
58 ], 73 ],
59 } 74 }
OLDNEW
« no previous file with comments | « content/common/mojo/mojo_channel_init.cc ('k') | content/content_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698