| 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 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 193 '<(DEPTH)/content/content.gyp:content_app_both', | 193 '<(DEPTH)/content/content.gyp:content_app_both', |
| 194 '<(DEPTH)/content/content_shell_and_tests.gyp:test_support_content', | 194 '<(DEPTH)/content/content_shell_and_tests.gyp:test_support_content', |
| 195 '<(DEPTH)/extensions/extensions.gyp:extensions_shell_and_test_pak', | 195 '<(DEPTH)/extensions/extensions.gyp:extensions_shell_and_test_pak', |
| 196 '<(DEPTH)/extensions/extensions.gyp:extensions_test_support', | 196 '<(DEPTH)/extensions/extensions.gyp:extensions_test_support', |
| 197 '<(DEPTH)/testing/gtest.gyp:gtest', | 197 '<(DEPTH)/testing/gtest.gyp:gtest', |
| 198 ], | 198 ], |
| 199 'sources': [ | 199 'sources': [ |
| 200 '../test/extensions_unittests_main.cc', | 200 '../test/extensions_unittests_main.cc', |
| 201 'browser/shell_nacl_browser_delegate_unittest.cc', | 201 'browser/shell_nacl_browser_delegate_unittest.cc', |
| 202 ], | 202 ], |
| 203 'conditions': [ |
| 204 ['disable_nacl==1', { |
| 205 'sources!': [ |
| 206 'browser/shell_nacl_browser_delegate_unittest.cc', |
| 207 ], |
| 208 }], |
| 209 ], |
| 203 }, | 210 }, |
| 204 { | 211 { |
| 205 'target_name': 'app_shell_version_header', | 212 'target_name': 'app_shell_version_header', |
| 206 'type': 'none', | 213 'type': 'none', |
| 207 'direct_dependent_settings': { | 214 'direct_dependent_settings': { |
| 208 'include_dirs': [ | 215 'include_dirs': [ |
| 209 '<(SHARED_INTERMEDIATE_DIR)', | 216 '<(SHARED_INTERMEDIATE_DIR)', |
| 210 ], | 217 ], |
| 211 }, | 218 }, |
| 212 'actions': [ | 219 'actions': [ |
| (...skipping 20 matching lines...) Expand all Loading... |
| 233 '<@(_outputs)', | 240 '<@(_outputs)', |
| 234 ], | 241 ], |
| 235 'includes': [ | 242 'includes': [ |
| 236 '../../build/util/version.gypi', | 243 '../../build/util/version.gypi', |
| 237 ], | 244 ], |
| 238 }, | 245 }, |
| 239 ], | 246 ], |
| 240 }, | 247 }, |
| 241 ], # targets | 248 ], # targets |
| 242 } | 249 } |
| OLD | NEW |