| 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 3502 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3513 }, | 3513 }, |
| 3514 'conditions': [ | 3514 'conditions': [ |
| 3515 ['os_posix==1', { | 3515 ['os_posix==1', { |
| 3516 'target_defaults': { | 3516 'target_defaults': { |
| 3517 'ldflags': [ | 3517 'ldflags': [ |
| 3518 '-Wl,-z,now', | 3518 '-Wl,-z,now', |
| 3519 '-Wl,-z,relro', | 3519 '-Wl,-z,relro', |
| 3520 ], | 3520 ], |
| 3521 # TODO(glider): enable the default options on other systems. | 3521 # TODO(glider): enable the default options on other systems. |
| 3522 'conditions': [ | 3522 'conditions': [ |
| 3523 ['use_sanitizer_options==1 and ((OS=="linux" and (chromeos==0 or targe
t_arch!="ia32")) or OS=="mac")', { | 3523 ['use_sanitizer_options==1 and (OS=="linux" or OS=="mac")', { |
| 3524 'dependencies': [ | 3524 'dependencies': [ |
| 3525 '<(DEPTH)/build/sanitizers/sanitizers.gyp:sanitizer_options', | 3525 '<(DEPTH)/build/sanitizers/sanitizers.gyp:sanitizer_options', |
| 3526 ], | 3526 ], |
| 3527 }], | 3527 }], |
| 3528 ], | 3528 ], |
| 3529 }, | 3529 }, |
| 3530 }], | 3530 }], |
| 3531 # TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580 | 3531 # TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580 |
| 3532 ['os_posix==1 and disable_fatal_linker_warnings==0 and use_evdev_gestures==0
and (chromeos==0 or target_arch!="arm")', { | 3532 ['os_posix==1 and disable_fatal_linker_warnings==0 and use_evdev_gestures==0
and (chromeos==0 or target_arch!="arm")', { |
| 3533 'target_defaults': { | 3533 'target_defaults': { |
| (...skipping 2351 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5885 # settings in target dicts. SYMROOT is a special case, because many other | 5885 # settings in target dicts. SYMROOT is a special case, because many other |
| 5886 # Xcode variables depend on it, including variables such as | 5886 # Xcode variables depend on it, including variables such as |
| 5887 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 5887 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 5888 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 5888 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 5889 # files to appear (when present) in the UI as actual files and not red | 5889 # files to appear (when present) in the UI as actual files and not red |
| 5890 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 5890 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 5891 # and therefore SYMROOT, needs to be set at the project level. | 5891 # and therefore SYMROOT, needs to be set at the project level. |
| 5892 'SYMROOT': '<(DEPTH)/xcodebuild', | 5892 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 5893 }, | 5893 }, |
| 5894 } | 5894 } |
| OLD | NEW |