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

Side by Side Diff: content/content_app.gypi

Issue 226213002: Removes use_mojo (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge 2 trunk 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
« no previous file with comments | « content/content.gyp ('k') | content/content_browser.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',
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 'content.gyp:content_jni_headers', 48 'content.gyp:content_jni_headers',
49 '../skia/skia.gyp:skia', 49 '../skia/skia.gyp:skia',
50 ], 50 ],
51 'includes': [ 51 'includes': [
52 '../build/android/cpufeatures.gypi', 52 '../build/android/cpufeatures.gypi',
53 ], 53 ],
54 }], 54 }],
55 ['OS=="ios"', { 55 ['OS=="ios"', {
56 'sources!': [ 56 'sources!': [
57 'app/content_main.cc', 57 'app/content_main.cc',
58 ],
59 }],
60 ['use_mojo==0', {
61 'sources!': [
62 'app/mojo/mojo_init.cc', 58 'app/mojo/mojo_init.cc',
63 'app/mojo/mojo_init.h', 59 'app/mojo/mojo_init.h',
64 ], 60 ],
65 }, { 61 }, { # OS!="ios"
66 'dependencies': [ 62 'dependencies': [
67 '../mojo/mojo.gyp:mojo_environment_chromium', 63 '../mojo/mojo.gyp:mojo_environment_chromium',
68 '../mojo/mojo.gyp:mojo_service_manager', 64 '../mojo/mojo.gyp:mojo_service_manager',
69 '../mojo/mojo.gyp:mojo_system', 65 '../mojo/mojo.gyp:mojo_system',
70 '../mojo/mojo.gyp:mojo_system_impl', 66 '../mojo/mojo.gyp:mojo_system_impl',
71 ], 67 ],
72 }], 68 }],
73 ], 69 ],
74 } 70 }
OLDNEW
« no previous file with comments | « content/content.gyp ('k') | content/content_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698