| 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 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 105 'renderer/shell_extensions_renderer_client.h', | 105 'renderer/shell_extensions_renderer_client.h', |
| 106 ], | 106 ], |
| 107 'conditions': [ | 107 'conditions': [ |
| 108 ['chromeos==1', { | 108 ['chromeos==1', { |
| 109 'dependencies': [ | 109 'dependencies': [ |
| 110 '<(DEPTH)/chromeos/chromeos.gyp:chromeos', | 110 '<(DEPTH)/chromeos/chromeos.gyp:chromeos', |
| 111 '<(DEPTH)/ui/chromeos/ui_chromeos.gyp:ui_chromeos', | 111 '<(DEPTH)/ui/chromeos/ui_chromeos.gyp:ui_chromeos', |
| 112 '<(DEPTH)/ui/display/display.gyp:display', | 112 '<(DEPTH)/ui/display/display.gyp:display', |
| 113 ], | 113 ], |
| 114 }], | 114 }], |
| 115 ['disable_nacl==0 and OS=="linux"', { |
| 116 'dependencies': [ |
| 117 '<(DEPTH)/components/nacl.gyp:nacl_helper', |
| 118 ], |
| 119 }], |
| 115 ['disable_nacl==0', { | 120 ['disable_nacl==0', { |
| 116 'dependencies': [ | 121 'dependencies': [ |
| 117 '<(DEPTH)/components/nacl.gyp:nacl', | 122 '<(DEPTH)/components/nacl.gyp:nacl', |
| 118 '<(DEPTH)/components/nacl.gyp:nacl_browser', | 123 '<(DEPTH)/components/nacl.gyp:nacl_browser', |
| 119 '<(DEPTH)/components/nacl.gyp:nacl_common', | 124 '<(DEPTH)/components/nacl.gyp:nacl_common', |
| 120 '<(DEPTH)/components/nacl.gyp:nacl_helper', | |
| 121 '<(DEPTH)/components/nacl.gyp:nacl_renderer', | 125 '<(DEPTH)/components/nacl.gyp:nacl_renderer', |
| 122 '<(DEPTH)/components/nacl.gyp:nacl_switches', | 126 '<(DEPTH)/components/nacl.gyp:nacl_switches', |
| 123 ], | 127 ], |
| 124 'sources': [ | 128 'sources': [ |
| 125 'browser/shell_nacl_browser_delegate.cc', | 129 'browser/shell_nacl_browser_delegate.cc', |
| 126 'browser/shell_nacl_browser_delegate.h', | 130 'browser/shell_nacl_browser_delegate.h', |
| 127 ], | 131 ], |
| 128 }], | 132 }], |
| 129 ], | 133 ], |
| 130 }, | 134 }, |
| (...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 255 '<@(_outputs)', | 259 '<@(_outputs)', |
| 256 ], | 260 ], |
| 257 'includes': [ | 261 'includes': [ |
| 258 '../../build/util/version.gypi', | 262 '../../build/util/version.gypi', |
| 259 ], | 263 ], |
| 260 }, | 264 }, |
| 261 ], | 265 ], |
| 262 }, | 266 }, |
| 263 ], # targets | 267 ], # targets |
| 264 } | 268 } |
| OLD | NEW |