OLD | NEW |
---|---|
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 Loading... | |
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 'includes': [ | |
112 '../../components/nacl/nacl_defines.gypi', | |
113 ], | |
114 'defines': [ | |
115 '<@(nacl_defines)', | |
116 ], | |
117 'dependencies': [ | |
118 '<(DEPTH)/components/nacl.gyp:nacl', | |
119 '<(DEPTH)/components/nacl.gyp:nacl_browser', | |
120 '<(DEPTH)/components/nacl.gyp:nacl_common', | |
121 '<(DEPTH)/components/nacl.gyp:nacl_renderer', | |
122 '<(DEPTH)/components/nacl.gyp:nacl_switches', | |
123 ], | |
124 'sources': [ | |
125 'browser/shell_nacl_browser_delegate.cc', | |
126 'browser/shell_nacl_browser_delegate.h', | |
127 'browser/shell_nacl_browser_delegate.cc', | |
teravest
2014/08/12 15:48:31
It looks like these were accidentally pasted twice
James Cook
2014/08/12 18:17:05
Yep. Fixed.
| |
128 'browser/shell_nacl_browser_delegate.h', | |
129 ], | |
130 }], | |
131 ['enable_plugins==1', { | |
132 'dependencies': [ | |
133 '<(DEPTH)/ppapi/ppapi_internal.gyp:ppapi_ipc', | |
134 ], | |
135 'sources': [ | |
136 'browser/shell_browser_pepper_host_factory.cc', | |
137 'browser/shell_browser_pepper_host_factory.h', | |
138 ], | |
139 }], | |
110 ], | 140 ], |
111 }, | 141 }, |
112 { | 142 { |
113 'target_name': 'app_shell', | 143 'target_name': 'app_shell', |
114 'type': 'executable', | 144 'type': 'executable', |
115 'defines!': ['CONTENT_IMPLEMENTATION'], | 145 'defines!': ['CONTENT_IMPLEMENTATION'], |
116 'dependencies': [ | 146 'dependencies': [ |
117 'app_shell_lib', | 147 'app_shell_lib', |
118 '<(DEPTH)/extensions/extensions.gyp:extensions_shell_and_test_pak', | 148 '<(DEPTH)/extensions/extensions.gyp:extensions_shell_and_test_pak', |
119 ], | 149 ], |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
161 'browser/shell_browsertest.cc', | 191 'browser/shell_browsertest.cc', |
162 'test/shell_test.h', | 192 'test/shell_test.h', |
163 'test/shell_test.cc', | 193 'test/shell_test.cc', |
164 'test/shell_test_launcher_delegate.cc', | 194 'test/shell_test_launcher_delegate.cc', |
165 'test/shell_test_launcher_delegate.h', | 195 'test/shell_test_launcher_delegate.h', |
166 'test/shell_tests_main.cc', | 196 'test/shell_tests_main.cc', |
167 ], | 197 ], |
168 }, | 198 }, |
169 ], # targets | 199 ], # targets |
170 } | 200 } |
OLD | NEW |