| 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 3019 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  3030             'inherit_from': ['Common_Base', 'x64_Base', 'Debug_Base'], |  3030             'inherit_from': ['Common_Base', 'x64_Base', 'Debug_Base'], | 
|  3031           }, |  3031           }, | 
|  3032           'Release_x64': { |  3032           'Release_x64': { | 
|  3033             'inherit_from': ['Common_Base', 'x64_Base', 'Release_Base'], |  3033             'inherit_from': ['Common_Base', 'x64_Base', 'Release_Base'], | 
|  3034           }, |  3034           }, | 
|  3035         }], |  3035         }], | 
|  3036       ], |  3036       ], | 
|  3037     }, |  3037     }, | 
|  3038   }, |  3038   }, | 
|  3039   'conditions': [ |  3039   'conditions': [ | 
|  3040     # TODO(jochen): Enable this on chromeos. http://crbug.com/353127 |  3040     # TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580 | 
|  3041     ['os_posix==1 and chromeos==0', { |  3041     ['os_posix==1 and (chromeos==0 or target_arch!="arm")', { | 
|  3042       'target_defaults': { |  3042       'target_defaults': { | 
|  3043         'ldflags': [ |  3043         'ldflags': [ | 
|  3044           '-Wl,--fatal-warnings', |  3044           '-Wl,--fatal-warnings', | 
|  3045           '-Wl,-z,now', |  3045           '-Wl,-z,now', | 
|  3046           '-Wl,-z,relro', |  3046           '-Wl,-z,relro', | 
|  3047         ], |  3047         ], | 
|  3048       }, |  3048       }, | 
|  3049     }], |  3049     }], | 
|  3050     ['os_posix==1 and chromeos==0', { |  3050     ['os_posix==1 and chromeos==0', { | 
|  3051       # Chrome OS enables -fstack-protector-strong via its build wrapper, |  3051       # Chrome OS enables -fstack-protector-strong via its build wrapper, | 
| (...skipping 2124 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  5176     # settings in target dicts.  SYMROOT is a special case, because many other |  5176     # settings in target dicts.  SYMROOT is a special case, because many other | 
|  5177     # Xcode variables depend on it, including variables such as |  5177     # Xcode variables depend on it, including variables such as | 
|  5178     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something |  5178     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something | 
|  5179     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |  5179     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 
|  5180     # files to appear (when present) in the UI as actual files and not red |  5180     # files to appear (when present) in the UI as actual files and not red | 
|  5181     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |  5181     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 
|  5182     # and therefore SYMROOT, needs to be set at the project level. |  5182     # and therefore SYMROOT, needs to be set at the project level. | 
|  5183     'SYMROOT': '<(DEPTH)/xcodebuild', |  5183     'SYMROOT': '<(DEPTH)/xcodebuild', | 
|  5184   }, |  5184   }, | 
|  5185 } |  5185 } | 
| OLD | NEW |