| 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 2065 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2076 '--no-output-all-resource-defines', | 2076 '--no-output-all-resource-defines', |
| 2077 ], | 2077 ], |
| 2078 }], | 2078 }], |
| 2079 ['OS=="mac" or OS=="ios"', { | 2079 ['OS=="mac" or OS=="ios"', { |
| 2080 'grit_defines': ['-D', 'scale_factors=2x'], | 2080 'grit_defines': ['-D', 'scale_factors=2x'], |
| 2081 }], | 2081 }], |
| 2082 ['OS == "ios"', { | 2082 ['OS == "ios"', { |
| 2083 'grit_defines': [ | 2083 'grit_defines': [ |
| 2084 '-t', 'ios', | 2084 '-t', 'ios', |
| 2085 # iOS uses a whitelist to filter resources. | 2085 # iOS uses a whitelist to filter resources. |
| 2086 '-w', '<(DEPTH)/build/ios/grit_whitelist.txt' | 2086 '-w', '<(DEPTH)/build/ios/grit_whitelist.txt', |
| 2087 '--no-output-all-resource-defines', |
| 2087 ], | 2088 ], |
| 2088 | 2089 |
| 2089 # Enable host builds when generating with ninja-ios. | 2090 # Enable host builds when generating with ninja-ios. |
| 2090 'conditions': [ | 2091 'conditions': [ |
| 2091 ['"<(GENERATOR)"=="ninja"', { | 2092 ['"<(GENERATOR)"=="ninja"', { |
| 2092 'host_os%': "mac", | 2093 'host_os%': "mac", |
| 2093 }], | 2094 }], |
| 2094 | 2095 |
| 2095 # TODO(sdefresne): Remove the target_subarch check once Apple has | 2096 # TODO(sdefresne): Remove the target_subarch check once Apple has |
| 2096 # upstreamed the support for "arm64". http://crbug.com/341453 | 2097 # upstreamed the support for "arm64". http://crbug.com/341453 |
| (...skipping 3825 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5922 # settings in target dicts. SYMROOT is a special case, because many other | 5923 # settings in target dicts. SYMROOT is a special case, because many other |
| 5923 # Xcode variables depend on it, including variables such as | 5924 # Xcode variables depend on it, including variables such as |
| 5924 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 5925 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 5925 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 5926 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 5926 # files to appear (when present) in the UI as actual files and not red | 5927 # files to appear (when present) in the UI as actual files and not red |
| 5927 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 5928 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 5928 # and therefore SYMROOT, needs to be set at the project level. | 5929 # and therefore SYMROOT, needs to be set at the project level. |
| 5929 'SYMROOT': '<(DEPTH)/xcodebuild', | 5930 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 5930 }, | 5931 }, |
| 5931 } | 5932 } |
| OLD | NEW |