| 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 78 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 89           # Override branding to select the desired branding flavor. | 89           # Override branding to select the desired branding flavor. | 
| 90           'branding%': 'Chromium', | 90           'branding%': 'Chromium', | 
| 91 | 91 | 
| 92           'conditions': [ | 92           'conditions': [ | 
| 93             # ChromeOS and Windows use Aura and Ash. | 93             # ChromeOS and Windows use Aura and Ash. | 
| 94             ['chromeos==1 or OS=="win" or OS=="linux"', { | 94             ['chromeos==1 or OS=="win" or OS=="linux"', { | 
| 95               'use_ash%': 1, | 95               'use_ash%': 1, | 
| 96               'use_aura%': 1, | 96               'use_aura%': 1, | 
| 97             }], | 97             }], | 
| 98 | 98 | 
| 99             ['chromecast==1', { | 99             ['chromecast==1 and OS!="android"', { | 
| 100               'embedded%': 1, | 100               'embedded%': 1, | 
| 101               'use_ozone%': 1, | 101               'use_ozone%': 1, | 
| 102             }], | 102             }], | 
| 103 | 103 | 
| 104             # Ozone uses Aura. | 104             # Ozone uses Aura. | 
| 105             ['use_ozone==1', { | 105             ['use_ozone==1', { | 
| 106               'use_aura%': 1, | 106               'use_aura%': 1, | 
| 107             }], | 107             }], | 
| 108 | 108 | 
| 109             # Whether we're a traditional desktop unix. | 109             # Whether we're a traditional desktop unix. | 
| (...skipping 5680 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 5790     # settings in target dicts.  SYMROOT is a special case, because many other | 5790     # settings in target dicts.  SYMROOT is a special case, because many other | 
| 5791     # Xcode variables depend on it, including variables such as | 5791     # Xcode variables depend on it, including variables such as | 
| 5792     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something | 5792     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something | 
| 5793     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 5793     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 
| 5794     # files to appear (when present) in the UI as actual files and not red | 5794     # files to appear (when present) in the UI as actual files and not red | 
| 5795     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 5795     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 
| 5796     # and therefore SYMROOT, needs to be set at the project level. | 5796     # and therefore SYMROOT, needs to be set at the project level. | 
| 5797     'SYMROOT': '<(DEPTH)/xcodebuild', | 5797     'SYMROOT': '<(DEPTH)/xcodebuild', | 
| 5798   }, | 5798   }, | 
| 5799 } | 5799 } | 
| OLD | NEW | 
|---|