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

Side by Side Diff: extensions/shell/app_shell.gyp

Issue 437503004: Add NaCl support to app_shell (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: (nacl-init) rebase 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 | « extensions/shell/app/shell_main_delegate.cc ('k') | extensions/shell/browser/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 {
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 'renderer/shell_renderer_main_delegate.h', 101 'renderer/shell_renderer_main_delegate.h',
102 ], 102 ],
103 'conditions': [ 103 'conditions': [
104 ['chromeos==1', { 104 ['chromeos==1', {
105 'dependencies': [ 105 'dependencies': [
106 '<(DEPTH)/chromeos/chromeos.gyp:chromeos', 106 '<(DEPTH)/chromeos/chromeos.gyp:chromeos',
107 '<(DEPTH)/ui/chromeos/ui_chromeos.gyp:ui_chromeos', 107 '<(DEPTH)/ui/chromeos/ui_chromeos.gyp:ui_chromeos',
108 '<(DEPTH)/ui/display/display.gyp:display', 108 '<(DEPTH)/ui/display/display.gyp:display',
109 ], 109 ],
110 }], 110 }],
111 ['disable_nacl==0', {
112 'dependencies': [
113 '<(DEPTH)/components/nacl.gyp:nacl',
114 '<(DEPTH)/components/nacl.gyp:nacl_browser',
115 '<(DEPTH)/components/nacl.gyp:nacl_common',
116 '<(DEPTH)/components/nacl.gyp:nacl_helper',
117 '<(DEPTH)/components/nacl.gyp:nacl_renderer',
118 '<(DEPTH)/components/nacl.gyp:nacl_switches',
119 ],
120 'sources': [
121 'browser/shell_nacl_browser_delegate.cc',
122 'browser/shell_nacl_browser_delegate.h',
123 ],
124 }],
111 ], 125 ],
112 }, 126 },
113 { 127 {
114 'target_name': 'app_shell', 128 'target_name': 'app_shell',
115 'type': 'executable', 129 'type': 'executable',
116 'defines!': ['CONTENT_IMPLEMENTATION'], 130 'defines!': ['CONTENT_IMPLEMENTATION'],
117 'dependencies': [ 131 'dependencies': [
118 'app_shell_lib', 132 'app_shell_lib',
119 '<(DEPTH)/extensions/extensions.gyp:extensions_shell_and_test_pak', 133 '<(DEPTH)/extensions/extensions.gyp:extensions_shell_and_test_pak',
120 ], 134 ],
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 '<@(_outputs)', 215 '<@(_outputs)',
202 ], 216 ],
203 'includes': [ 217 'includes': [
204 '../../build/util/version.gypi', 218 '../../build/util/version.gypi',
205 ], 219 ],
206 }, 220 },
207 ], 221 ],
208 }, 222 },
209 ], # targets 223 ], # targets
210 } 224 }
OLDNEW
« no previous file with comments | « extensions/shell/app/shell_main_delegate.cc ('k') | extensions/shell/browser/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698