| 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 3513 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3524 }], | 3524 }], |
| 3525 # TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580 | 3525 # TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580 |
| 3526 ['os_posix==1 and disable_fatal_linker_warnings==0 and use_evdev_gestures==0
and (chromeos==0 or target_arch!="arm")', { | 3526 ['os_posix==1 and disable_fatal_linker_warnings==0 and use_evdev_gestures==0
and (chromeos==0 or target_arch!="arm")', { |
| 3527 'target_defaults': { | 3527 'target_defaults': { |
| 3528 'ldflags': [ | 3528 'ldflags': [ |
| 3529 '-Wl,--fatal-warnings', | 3529 '-Wl,--fatal-warnings', |
| 3530 ], | 3530 ], |
| 3531 }, | 3531 }, |
| 3532 }], | 3532 }], |
| 3533 # TODO(thakis): Enable this everywhere. http://crbug.com/371125 | 3533 # TODO(thakis): Enable this everywhere. http://crbug.com/371125 |
| 3534 ['(OS=="linux" or OS=="android") and asan==0 and msan==0 and tsan==0 and use
_ozone!=1 and buildtype!="Official"', { | 3534 ['(OS=="linux" or OS=="android") and asan==0 and msan==0 and tsan==0 and use
_ozone!=1', { |
| 3535 'target_defaults': { | 3535 'target_defaults': { |
| 3536 'ldflags': [ | 3536 'ldflags': [ |
| 3537 '-Wl,-z,defs', | 3537 '-Wl,-z,defs', |
| 3538 ], | 3538 ], |
| 3539 }, | 3539 }, |
| 3540 }], | 3540 }], |
| 3541 ['os_posix==1 and chromeos==0', { | 3541 ['os_posix==1 and chromeos==0', { |
| 3542 # Chrome OS enables -fstack-protector-strong via its build wrapper, | 3542 # Chrome OS enables -fstack-protector-strong via its build wrapper, |
| 3543 # and we want to avoid overriding this, so stack-protector is only | 3543 # and we want to avoid overriding this, so stack-protector is only |
| 3544 # enabled when not building on Chrome OS. | 3544 # enabled when not building on Chrome OS. |
| (...skipping 2306 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5851 # settings in target dicts. SYMROOT is a special case, because many other | 5851 # settings in target dicts. SYMROOT is a special case, because many other |
| 5852 # Xcode variables depend on it, including variables such as | 5852 # Xcode variables depend on it, including variables such as |
| 5853 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 5853 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 5854 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 5854 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 5855 # files to appear (when present) in the UI as actual files and not red | 5855 # files to appear (when present) in the UI as actual files and not red |
| 5856 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 5856 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 5857 # and therefore SYMROOT, needs to be set at the project level. | 5857 # and therefore SYMROOT, needs to be set at the project level. |
| 5858 'SYMROOT': '<(DEPTH)/xcodebuild', | 5858 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 5859 }, | 5859 }, |
| 5860 } | 5860 } |
| OLD | NEW |