| OLD | NEW | 
|---|
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 # IMPORTANT: | 5 # IMPORTANT: | 
| 6 # Please don't directly include this file if you are building via gyp_chromium, | 6 # Please don't directly include this file if you are building via gyp_chromium, | 
| 7 # since gyp_chromium is automatically forcing its inclusion. | 7 # since gyp_chromium is automatically forcing its inclusion. | 
| 8 { | 8 { | 
| 9   # Variables expected to be overriden on the GYP command line (-D) or by | 9   # Variables expected to be overriden on the GYP command line (-D) or by | 
| 10   # ~/.gyp/include.gypi. | 10   # ~/.gyp/include.gypi. | 
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 77             ['chromeos==1 or OS=="win"', { | 77             ['chromeos==1 or OS=="win"', { | 
| 78               'use_ash%': 1, | 78               'use_ash%': 1, | 
| 79               'use_aura%': 1, | 79               'use_aura%': 1, | 
| 80             }], | 80             }], | 
| 81 | 81 | 
| 82             # Ozone uses Aura. | 82             # Ozone uses Aura. | 
| 83             ['use_ozone==1', { | 83             ['use_ozone==1', { | 
| 84               'use_aura%': 1, | 84               'use_aura%': 1, | 
| 85             }], | 85             }], | 
| 86 | 86 | 
|  | 87             # ToT Linux should be aura. | 
|  | 88             # | 
|  | 89             # TODO(erg): Merge this into the previous block once compiling with | 
|  | 90             # aura safely implies including ash capabilities. | 
|  | 91             ['OS=="linux"', { | 
|  | 92               'use_aura%': 1, | 
|  | 93             }], | 
|  | 94 | 
| 87             # Whether we're a traditional desktop unix. | 95             # Whether we're a traditional desktop unix. | 
| 88             ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") a
      nd chromeos==0', { | 96             ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") a
      nd chromeos==0', { | 
| 89               'desktop_linux%': 1, | 97               'desktop_linux%': 1, | 
| 90             }, { | 98             }, { | 
| 91               'desktop_linux%': 0, | 99               'desktop_linux%': 0, | 
| 92             }], | 100             }], | 
| 93 | 101 | 
| 94             # Compute the architecture that we're building on. | 102             # Compute the architecture that we're building on. | 
| 95             ['OS=="win" or OS=="mac" or OS=="ios"', { | 103             ['OS=="win" or OS=="mac" or OS=="ios"', { | 
| 96               'host_arch%': 'ia32', | 104               'host_arch%': 'ia32', | 
| (...skipping 4737 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 4834     # settings in target dicts.  SYMROOT is a special case, because many other | 4842     # settings in target dicts.  SYMROOT is a special case, because many other | 
| 4835     # Xcode variables depend on it, including variables such as | 4843     # Xcode variables depend on it, including variables such as | 
| 4836     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something | 4844     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something | 
| 4837     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 4845     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 
| 4838     # files to appear (when present) in the UI as actual files and not red | 4846     # files to appear (when present) in the UI as actual files and not red | 
| 4839     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 4847     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 
| 4840     # and therefore SYMROOT, needs to be set at the project level. | 4848     # and therefore SYMROOT, needs to be set at the project level. | 
| 4841     'SYMROOT': '<(DEPTH)/xcodebuild', | 4849     'SYMROOT': '<(DEPTH)/xcodebuild', | 
| 4842   }, | 4850   }, | 
| 4843 } | 4851 } | 
| OLD | NEW | 
|---|