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 2354 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2365 'Release_x64': { | 2365 'Release_x64': { |
2366 'inherit_from': ['Common_Base', 'x64_Base', 'Release_Base'], | 2366 'inherit_from': ['Common_Base', 'x64_Base', 'Release_Base'], |
2367 }, | 2367 }, |
2368 }], | 2368 }], |
2369 ], | 2369 ], |
2370 }, | 2370 }, |
2371 }, | 2371 }, |
2372 'conditions': [ | 2372 'conditions': [ |
2373 ['os_posix==1', { | 2373 ['os_posix==1', { |
2374 'target_defaults': { | 2374 'target_defaults': { |
2375 'ldflags': [ | |
2376 '-Wl,-z,now', | |
2377 '-Wl,-z,relro', | |
2378 ], | |
2379 }, | |
2380 }], | |
2381 ['os_posix==1 and chromeos!=1', { | |
Jorge Lucangeli Obes
2013/01/29 23:45:51
chromeos==0 seems to be the style in the rest of t
keescook
2013/01/29 23:50:17
Done.
| |
2382 'target_defaults': { | |
Jorge Lucangeli Obes
2013/01/29 23:45:51
Maybe add a comment clarifying that the change wor
keescook
2013/01/29 23:50:17
Done.
| |
2375 'cflags': [ | 2383 'cflags': [ |
2376 # TODO(phajdan.jr): Use -fstack-protector-strong when our gcc | 2384 # TODO(phajdan.jr): Use -fstack-protector-strong when our gcc |
2377 # supports it. | 2385 # supports it. |
2378 '-fstack-protector', | 2386 '-fstack-protector', |
2379 '--param=ssp-buffer-size=4', | 2387 '--param=ssp-buffer-size=4', |
2380 ], | 2388 ], |
2381 'ldflags': [ | |
2382 '-Wl,-z,now', | |
2383 '-Wl,-z,relro', | |
2384 ], | |
2385 }, | 2389 }, |
2386 }], | 2390 }], |
2387 ['os_posix==1 and OS!="mac" and OS!="ios"', { | 2391 ['os_posix==1 and OS!="mac" and OS!="ios"', { |
2388 'target_defaults': { | 2392 'target_defaults': { |
2389 # Enable -Werror by default, but put it in a variable so it can | 2393 # Enable -Werror by default, but put it in a variable so it can |
2390 # be disabled in ~/.gyp/include.gypi on the valgrind builders. | 2394 # be disabled in ~/.gyp/include.gypi on the valgrind builders. |
2391 'variables': { | 2395 'variables': { |
2392 'werror%': '-Werror', | 2396 'werror%': '-Werror', |
2393 'libraries_for_target%': '', | 2397 'libraries_for_target%': '', |
2394 }, | 2398 }, |
(...skipping 1591 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
3986 # settings in target dicts. SYMROOT is a special case, because many other | 3990 # settings in target dicts. SYMROOT is a special case, because many other |
3987 # Xcode variables depend on it, including variables such as | 3991 # Xcode variables depend on it, including variables such as |
3988 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 3992 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
3989 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 3993 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
3990 # files to appear (when present) in the UI as actual files and not red | 3994 # files to appear (when present) in the UI as actual files and not red |
3991 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 3995 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
3992 # and therefore SYMROOT, needs to be set at the project level. | 3996 # and therefore SYMROOT, needs to be set at the project level. |
3993 'SYMROOT': '<(DEPTH)/xcodebuild', | 3997 'SYMROOT': '<(DEPTH)/xcodebuild', |
3994 }, | 3998 }, |
3995 } | 3999 } |
OLD | NEW |