| 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 3500 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 3511       }, | 3511       }, | 
| 3512     }], | 3512     }], | 
| 3513     # TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580 | 3513     # TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580 | 
| 3514     ['os_posix==1 and disable_fatal_linker_warnings==0 and use_evdev_gestures==0
       and (chromeos==0 or target_arch!="arm")', { | 3514     ['os_posix==1 and disable_fatal_linker_warnings==0 and use_evdev_gestures==0
       and (chromeos==0 or target_arch!="arm")', { | 
| 3515       'target_defaults': { | 3515       'target_defaults': { | 
| 3516         'ldflags': [ | 3516         'ldflags': [ | 
| 3517           '-Wl,--fatal-warnings', | 3517           '-Wl,--fatal-warnings', | 
| 3518         ], | 3518         ], | 
| 3519       }, | 3519       }, | 
| 3520     }], | 3520     }], | 
|  | 3521     # TODO(thakis): Enable this everywhere. http://crbug.com/371125 | 
|  | 3522     ['OS=="linux" and chromeos==0 and component=="shared_library" and use_ozone!
      =1 and buildtype!="Official"', { | 
|  | 3523       'target_defaults': { | 
|  | 3524         'ldflags': [ | 
|  | 3525           '-Wl,-z,defs', | 
|  | 3526         ], | 
|  | 3527       }, | 
|  | 3528     }], | 
| 3521     ['os_posix==1 and chromeos==0', { | 3529     ['os_posix==1 and chromeos==0', { | 
| 3522       # Chrome OS enables -fstack-protector-strong via its build wrapper, | 3530       # Chrome OS enables -fstack-protector-strong via its build wrapper, | 
| 3523       # and we want to avoid overriding this, so stack-protector is only | 3531       # and we want to avoid overriding this, so stack-protector is only | 
| 3524       # enabled when not building on Chrome OS. | 3532       # enabled when not building on Chrome OS. | 
| 3525       # TODO(phajdan.jr): Use -fstack-protector-strong when our gcc | 3533       # TODO(phajdan.jr): Use -fstack-protector-strong when our gcc | 
| 3526       # supports it. | 3534       # supports it. | 
| 3527       'target_defaults': { | 3535       'target_defaults': { | 
| 3528         'cflags': [ | 3536         'cflags': [ | 
| 3529           '-fstack-protector', | 3537           '-fstack-protector', | 
| 3530           '--param=ssp-buffer-size=4', | 3538           '--param=ssp-buffer-size=4', | 
| (...skipping 2289 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 5820     # settings in target dicts.  SYMROOT is a special case, because many other | 5828     # settings in target dicts.  SYMROOT is a special case, because many other | 
| 5821     # Xcode variables depend on it, including variables such as | 5829     # Xcode variables depend on it, including variables such as | 
| 5822     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something | 5830     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something | 
| 5823     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 5831     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 
| 5824     # files to appear (when present) in the UI as actual files and not red | 5832     # files to appear (when present) in the UI as actual files and not red | 
| 5825     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 5833     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 
| 5826     # and therefore SYMROOT, needs to be set at the project level. | 5834     # and therefore SYMROOT, needs to be set at the project level. | 
| 5827     'SYMROOT': '<(DEPTH)/xcodebuild', | 5835     'SYMROOT': '<(DEPTH)/xcodebuild', | 
| 5828   }, | 5836   }, | 
| 5829 } | 5837 } | 
| OLD | NEW | 
|---|