| 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 2961 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2972 'inherit_from': ['Common_Base', 'x64_Base', 'Debug_Base'], | 2972 'inherit_from': ['Common_Base', 'x64_Base', 'Debug_Base'], |
| 2973 }, | 2973 }, |
| 2974 'Release_x64': { | 2974 'Release_x64': { |
| 2975 'inherit_from': ['Common_Base', 'x64_Base', 'Release_Base'], | 2975 'inherit_from': ['Common_Base', 'x64_Base', 'Release_Base'], |
| 2976 }, | 2976 }, |
| 2977 }], | 2977 }], |
| 2978 ], | 2978 ], |
| 2979 }, | 2979 }, |
| 2980 }, | 2980 }, |
| 2981 'conditions': [ | 2981 'conditions': [ |
| 2982 ['os_posix==1', { | 2982 # TODO(jochen): Enable this on chromeos. http://crbug.com/353127 |
| 2983 ['os_posix==1 && chromeos==0', { |
| 2983 'target_defaults': { | 2984 'target_defaults': { |
| 2984 'ldflags': [ | 2985 'ldflags': [ |
| 2985 '-Wl,--fatal-warnings', | 2986 '-Wl,--fatal-warnings', |
| 2986 '-Wl,-z,now', | 2987 '-Wl,-z,now', |
| 2987 '-Wl,-z,relro', | 2988 '-Wl,-z,relro', |
| 2988 ], | 2989 ], |
| 2989 }, | 2990 }, |
| 2990 }], | 2991 }], |
| 2991 ['os_posix==1 and chromeos==0', { | 2992 ['os_posix==1 and chromeos==0', { |
| 2992 # Chrome OS enables -fstack-protector-strong via its build wrapper, | 2993 # Chrome OS enables -fstack-protector-strong via its build wrapper, |
| (...skipping 2064 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5057 # settings in target dicts. SYMROOT is a special case, because many other | 5058 # settings in target dicts. SYMROOT is a special case, because many other |
| 5058 # Xcode variables depend on it, including variables such as | 5059 # Xcode variables depend on it, including variables such as |
| 5059 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 5060 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 5060 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 5061 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 5061 # files to appear (when present) in the UI as actual files and not red | 5062 # files to appear (when present) in the UI as actual files and not red |
| 5062 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 5063 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 5063 # and therefore SYMROOT, needs to be set at the project level. | 5064 # and therefore SYMROOT, needs to be set at the project level. |
| 5064 'SYMROOT': '<(DEPTH)/xcodebuild', | 5065 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 5065 }, | 5066 }, |
| 5066 } | 5067 } |
| OLD | NEW |