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

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) cleanup 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
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 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 'renderer/shell_renderer_main_delegate.h', 100 'renderer/shell_renderer_main_delegate.h',
101 ], 101 ],
102 'conditions': [ 102 'conditions': [
103 ['chromeos==1', { 103 ['chromeos==1', {
104 'dependencies': [ 104 'dependencies': [
105 '<(DEPTH)/chromeos/chromeos.gyp:chromeos', 105 '<(DEPTH)/chromeos/chromeos.gyp:chromeos',
106 '<(DEPTH)/ui/chromeos/ui_chromeos.gyp:ui_chromeos', 106 '<(DEPTH)/ui/chromeos/ui_chromeos.gyp:ui_chromeos',
107 '<(DEPTH)/ui/display/display.gyp:display', 107 '<(DEPTH)/ui/display/display.gyp:display',
108 ], 108 ],
109 }], 109 }],
110 ['disable_nacl==0', {
111 'dependencies': [
112 '<(DEPTH)/components/nacl.gyp:nacl',
113 '<(DEPTH)/components/nacl.gyp:nacl_browser',
114 '<(DEPTH)/components/nacl.gyp:nacl_common',
115 '<(DEPTH)/components/nacl.gyp:nacl_helper',
116 '<(DEPTH)/components/nacl.gyp:nacl_renderer',
117 '<(DEPTH)/components/nacl.gyp:nacl_switches',
118 ],
119 'sources': [
120 'browser/shell_nacl_browser_delegate.cc',
121 'browser/shell_nacl_browser_delegate.h',
122 ],
123 }],
110 ], 124 ],
111 }, 125 },
112 { 126 {
113 'target_name': 'app_shell', 127 'target_name': 'app_shell',
114 'type': 'executable', 128 'type': 'executable',
115 'defines!': ['CONTENT_IMPLEMENTATION'], 129 'defines!': ['CONTENT_IMPLEMENTATION'],
116 'dependencies': [ 130 'dependencies': [
117 'app_shell_lib', 131 'app_shell_lib',
118 '<(DEPTH)/extensions/extensions.gyp:extensions_shell_and_test_pak', 132 '<(DEPTH)/extensions/extensions.gyp:extensions_shell_and_test_pak',
119 ], 133 ],
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 'browser/shell_browsertest.cc', 175 'browser/shell_browsertest.cc',
162 'test/shell_test.h', 176 'test/shell_test.h',
163 'test/shell_test.cc', 177 'test/shell_test.cc',
164 'test/shell_test_launcher_delegate.cc', 178 'test/shell_test_launcher_delegate.cc',
165 'test/shell_test_launcher_delegate.h', 179 'test/shell_test_launcher_delegate.h',
166 'test/shell_tests_main.cc', 180 'test/shell_tests_main.cc',
167 ], 181 ],
168 }, 182 },
169 ], # targets 183 ], # targets
170 } 184 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698