| 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 85 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 96             ['(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', { | 
| 97               'desktop_linux%': 1, | 97               'desktop_linux%': 1, | 
| 98             }, { | 98             }, { | 
| 99               'desktop_linux%': 0, | 99               'desktop_linux%': 0, | 
| 100             }], | 100             }], | 
| 101 | 101 | 
| 102             # Compute the architecture that we're building on. | 102             # Compute the architecture that we're building on. | 
| 103             ['OS=="win" or OS=="mac" or OS=="ios"', { | 103             ['OS=="win" or OS=="mac" or OS=="ios"', { | 
| 104               'host_arch%': 'ia32', | 104               'host_arch%': 'ia32', | 
| 105             }, { | 105             }, { | 
| 106               # This handles the Unix platforms for which there is some support. | 106               'host_arch%': '<!(python <(DEPTH)/build/linux/detect_host_arch.py)
      ', | 
| 107               # Anything else gets passed through, which probably won't work |  | 
| 108               # very well; such hosts should pass an explicit target_arch to |  | 
| 109               # gyp. |  | 
| 110               'host_arch%': |  | 
| 111                 '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s
      /arm.*/arm/;s/i86pc/ia32/")', |  | 
| 112             }], | 107             }], | 
| 113 | 108 | 
| 114             # Embedded implies ozone. | 109             # Embedded implies ozone. | 
| 115             ['embedded==1', { | 110             ['embedded==1', { | 
| 116               'use_ozone%': 1, | 111               'use_ozone%': 1, | 
| 117             }], | 112             }], | 
| 118 | 113 | 
| 119             ['embedded==1', { | 114             ['embedded==1', { | 
| 120               'use_system_fontconfig%': 0, | 115               'use_system_fontconfig%': 0, | 
| 121             }, { | 116             }, { | 
| (...skipping 4763 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 4885     # settings in target dicts.  SYMROOT is a special case, because many other | 4880     # settings in target dicts.  SYMROOT is a special case, because many other | 
| 4886     # Xcode variables depend on it, including variables such as | 4881     # Xcode variables depend on it, including variables such as | 
| 4887     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something | 4882     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something | 
| 4888     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 4883     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 
| 4889     # files to appear (when present) in the UI as actual files and not red | 4884     # files to appear (when present) in the UI as actual files and not red | 
| 4890     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 4885     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 
| 4891     # and therefore SYMROOT, needs to be set at the project level. | 4886     # and therefore SYMROOT, needs to be set at the project level. | 
| 4892     'SYMROOT': '<(DEPTH)/xcodebuild', | 4887     'SYMROOT': '<(DEPTH)/xcodebuild', | 
| 4893   }, | 4888   }, | 
| 4894 } | 4889 } | 
| OLD | NEW | 
|---|