| 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 5396 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5407 ], # target_conditions | 5407 ], # target_conditions |
| 5408 }, # target_defaults | 5408 }, # target_defaults |
| 5409 }], # OS=="mac" | 5409 }], # OS=="mac" |
| 5410 ['OS=="ios"', { | 5410 ['OS=="ios"', { |
| 5411 'includes': [ | 5411 'includes': [ |
| 5412 'ios/coverage.gypi', | 5412 'ios/coverage.gypi', |
| 5413 ], | 5413 ], |
| 5414 'target_defaults': { | 5414 'target_defaults': { |
| 5415 'xcode_settings' : { | 5415 'xcode_settings' : { |
| 5416 'CLANG_CXX_LANGUAGE_STANDARD': 'c++11', | 5416 'CLANG_CXX_LANGUAGE_STANDARD': 'c++11', |
| 5417 'ENABLE_BITCODE': 'NO', |
| 5417 | 5418 |
| 5418 'conditions': [ | 5419 'conditions': [ |
| 5419 # Older Xcodes do not support -Wno-deprecated-register, so pass an | 5420 # Older Xcodes do not support -Wno-deprecated-register, so pass an |
| 5420 # additional flag to suppress the "unknown compiler option" error. | 5421 # additional flag to suppress the "unknown compiler option" error. |
| 5421 # Restrict this flag to builds that are either compiling with Xcode | 5422 # Restrict this flag to builds that are either compiling with Xcode |
| 5422 # or compiling with Xcode's Clang. This will allow Ninja builds to | 5423 # or compiling with Xcode's Clang. This will allow Ninja builds to |
| 5423 # continue failing on unknown compiler options. | 5424 # continue failing on unknown compiler options. |
| 5424 # TODO(rohitrao): This flag is temporary and should be removed as | 5425 # TODO(rohitrao): This flag is temporary and should be removed as |
| 5425 # soon as the iOS bots are updated to use Xcode 5.1. | 5426 # soon as the iOS bots are updated to use Xcode 5.1. |
| 5426 ['clang_xcode==1', { | 5427 ['clang_xcode==1', { |
| (...skipping 887 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6314 # settings in target dicts. SYMROOT is a special case, because many other | 6315 # settings in target dicts. SYMROOT is a special case, because many other |
| 6315 # Xcode variables depend on it, including variables such as | 6316 # Xcode variables depend on it, including variables such as |
| 6316 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 6317 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 6317 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 6318 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 6318 # files to appear (when present) in the UI as actual files and not red | 6319 # files to appear (when present) in the UI as actual files and not red |
| 6319 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 6320 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 6320 # and therefore SYMROOT, needs to be set at the project level. | 6321 # and therefore SYMROOT, needs to be set at the project level. |
| 6321 'SYMROOT': '<(DEPTH)/xcodebuild', | 6322 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 6322 }, | 6323 }, |
| 6323 } | 6324 } |
| OLD | NEW |