| OLD | NEW |
| 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2011 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 'variables': { | 9 'variables': { |
| 10 'version_py_path': '../tools/build/version.py', | 10 'version_py_path': '../tools/build/version.py', |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 'python': [ | 22 'python': [ |
| 23 '<(DEPTH)\\third_party\\python_26\\setup_env.bat && python' | 23 '<(DEPTH)\\third_party\\python_26\\setup_env.bat && python' |
| 24 ], | 24 ], |
| 25 }, { # OS != win | 25 }, { # OS != win |
| 26 'python': [ | 26 'python': [ |
| 27 'python' | 27 'python' |
| 28 ], | 28 ], |
| 29 }], | 29 }], |
| 30 ], | 30 ], |
| 31 }, | 31 }, |
| 32 'includes': [ |
| 33 '../build/win_precompile.gypi', |
| 34 ], |
| 32 'target_defaults': { | 35 'target_defaults': { |
| 33 'dependencies': [ | 36 'dependencies': [ |
| 34 '../chrome/chrome.gyp:chrome_resources', | 37 '../chrome/chrome.gyp:chrome_resources', |
| 35 '../chrome/chrome.gyp:chrome_strings', | 38 '../chrome/chrome.gyp:chrome_strings', |
| 36 '../chrome/chrome.gyp:packed_resources', | 39 '../chrome/chrome.gyp:packed_resources', |
| 37 '../chrome/chrome.gyp:theme_resources', | 40 '../chrome/chrome.gyp:theme_resources', |
| 38 '../skia/skia.gyp:skia', | 41 '../skia/skia.gyp:skia', |
| 39 ], | 42 ], |
| 40 'defines': [ 'ISOLATION_AWARE_ENABLED=1' ], | 43 'defines': [ 'ISOLATION_AWARE_ENABLED=1' ], |
| 41 'include_dirs': [ | 44 'include_dirs': [ |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 125 '<(SHARED_INTERMEDIATE_DIR)', | 128 '<(SHARED_INTERMEDIATE_DIR)', |
| 126 ], | 129 ], |
| 127 'conditions': [ | 130 'conditions': [ |
| 128 # We can't instrument code for coverage if it depends on 3rd party | 131 # We can't instrument code for coverage if it depends on 3rd party |
| 129 # binaries that we don't have PDBs for. See here for more details: | 132 # binaries that we don't have PDBs for. See here for more details: |
| 130 # http://connect.microsoft.com/VisualStudio/feedback/details/176188/can-
not-disable-warning-lnk4099 | 133 # http://connect.microsoft.com/VisualStudio/feedback/details/176188/can-
not-disable-warning-lnk4099 |
| 131 ['coverage==0', { | 134 ['coverage==0', { |
| 132 'conditions': [ | 135 'conditions': [ |
| 133 ['OS=="win"', { | 136 ['OS=="win"', { |
| 134 'dependencies': [ | 137 'dependencies': [ |
| 135 '../breakpad/breakpad.gyp:breakpad_handler', | 138 '../breakpad/breakpad.gyp:breakpad_handler', |
| 136 # TODO(slightlyoff): Get automation targets working on OS X | 139 # TODO(slightlyoff): Get automation targets working on OS X |
| 137 '../chrome/chrome.gyp:automation', | 140 '../chrome/chrome.gyp:automation', |
| 138 ], | 141 ], |
| 139 }], | 142 }], |
| 140 ], | 143 ], |
| 141 }], | 144 }], |
| 142 ['OS=="win" and buildtype=="Official"', { | 145 ['OS=="win" and buildtype=="Official"', { |
| 143 'configurations': { | 146 'configurations': { |
| 144 'Release': { | 147 'Release': { |
| 145 'msvs_settings': { | 148 'msvs_settings': { |
| (...skipping 899 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1045 # Use outputs of this action as inputs for the main target build. | 1048 # Use outputs of this action as inputs for the main target build. |
| 1046 # Seems as a misnomer but makes this happy on Linux (scons). | 1049 # Seems as a misnomer but makes this happy on Linux (scons). |
| 1047 'process_outputs_as_sources': 1, | 1050 'process_outputs_as_sources': 1, |
| 1048 }, | 1051 }, |
| 1049 ], | 1052 ], |
| 1050 }, | 1053 }, |
| 1051 ], | 1054 ], |
| 1052 }, ], # 'coverage!=0' | 1055 }, ], # 'coverage!=0' |
| 1053 ], # 'conditions' | 1056 ], # 'conditions' |
| 1054 } | 1057 } |
| OLD | NEW |