Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2011 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 1442 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1453 }, | 1453 }, |
| 1454 }], | 1454 }], |
| 1455 ], | 1455 ], |
| 1456 }, | 1456 }, |
| 1457 'Release_Base': { | 1457 'Release_Base': { |
| 1458 'abstract': 1, | 1458 'abstract': 1, |
| 1459 'defines': [ | 1459 'defines': [ |
| 1460 'NDEBUG', | 1460 'NDEBUG', |
| 1461 ], | 1461 ], |
| 1462 'xcode_settings': { | 1462 'xcode_settings': { |
| 1463 'DEAD_CODE_STRIPPING': 'YES', # -Wl,-dead_strip | 1463 'DEAD_CODE_STRIPPING': 'NO', # -Wl,-dead_strip |
|
Ryan Sleevi
2011/11/25 07:04:58
Did you mean to change this both here and on 2328?
| |
| 1464 'GCC_OPTIMIZATION_LEVEL': '<(mac_release_optimization)', | 1464 'GCC_OPTIMIZATION_LEVEL': '<(mac_release_optimization)', |
| 1465 'OTHER_CFLAGS': [ '<@(release_extra_cflags)', ], | 1465 'OTHER_CFLAGS': [ '<@(release_extra_cflags)', ], |
| 1466 }, | 1466 }, |
| 1467 'msvs_settings': { | 1467 'msvs_settings': { |
| 1468 'VCCLCompilerTool': { | 1468 'VCCLCompilerTool': { |
| 1469 'Optimization': '<(win_release_Optimization)', | 1469 'Optimization': '<(win_release_Optimization)', |
| 1470 'RuntimeLibrary': '<(win_release_RuntimeLibrary)', | 1470 'RuntimeLibrary': '<(win_release_RuntimeLibrary)', |
| 1471 'conditions': [ | 1471 'conditions': [ |
| 1472 # According to MSVS, InlineFunctionExpansion=0 means | 1472 # According to MSVS, InlineFunctionExpansion=0 means |
| 1473 # "default inlining", not "/Ob0". | 1473 # "default inlining", not "/Ob0". |
| (...skipping 439 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1913 }], | 1913 }], |
| 1914 ['clang==1 and clang_load!="" and clang_add_plugin!=""', { | 1914 ['clang==1 and clang_load!="" and clang_add_plugin!=""', { |
| 1915 'cflags': [ | 1915 'cflags': [ |
| 1916 '-Xclang', '-load', '-Xclang', '<(clang_load)', | 1916 '-Xclang', '-load', '-Xclang', '<(clang_load)', |
| 1917 '-Xclang', '-add-plugin', '-Xclang', '<(clang_add_plugin)', | 1917 '-Xclang', '-add-plugin', '-Xclang', '<(clang_add_plugin)', |
| 1918 ], | 1918 ], |
| 1919 }], | 1919 }], |
| 1920 ['asan==1', { | 1920 ['asan==1', { |
| 1921 # Only in the linux section for now, since ASAN doesn't | 1921 # Only in the linux section for now, since ASAN doesn't |
| 1922 # work on Mac yet. | 1922 # work on Mac yet. |
| 1923 » # TODO(glider): -fasan is deprecated. Remove it when we stop using | 1923 # TODO(glider): -fasan is deprecated. Remove it when we stop using |
| 1924 » # it. | 1924 # it. |
| 1925 'cflags': [ | 1925 'cflags': [ |
| 1926 '-fasan', | 1926 '-fasan', |
| 1927 » '-faddress-sanitizer', | 1927 '-faddress-sanitizer', |
| 1928 '-w', | 1928 '-w', |
| 1929 » '-DADDRESS_SANITIZER', | 1929 '-DADDRESS_SANITIZER', |
| 1930 ], | 1930 ], |
| 1931 'ldflags': [ | 1931 'ldflags': [ |
| 1932 '-fasan', | 1932 '-fasan', |
| 1933 » '-faddress-sanitizer', | 1933 '-faddress-sanitizer', |
| 1934 ], | 1934 ], |
| 1935 }], | 1935 }], |
| 1936 ['no_strict_aliasing==1', { | 1936 ['no_strict_aliasing==1', { |
| 1937 'cflags': [ | 1937 'cflags': [ |
| 1938 '-fno-strict-aliasing', | 1938 '-fno-strict-aliasing', |
| 1939 ], | 1939 ], |
| 1940 }], | 1940 }], |
| 1941 ['linux_breakpad==1', { | 1941 ['linux_breakpad==1', { |
| 1942 'cflags': [ '-g' ], | 1942 'cflags': [ '-g' ], |
| 1943 'defines': ['USE_LINUX_BREAKPAD'], | 1943 'defines': ['USE_LINUX_BREAKPAD'], |
| (...skipping 373 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2317 '>@(change_mach_o_flags_options)', | 2317 '>@(change_mach_o_flags_options)', |
| 2318 ], | 2318 ], |
| 2319 }, | 2319 }, |
| 2320 ], | 2320 ], |
| 2321 'conditions': [ | 2321 'conditions': [ |
| 2322 ['asan==1', { | 2322 ['asan==1', { |
| 2323 'variables': { | 2323 'variables': { |
| 2324 'asan_saves_file': 'asan.saves', | 2324 'asan_saves_file': 'asan.saves', |
| 2325 }, | 2325 }, |
| 2326 'xcode_settings': { | 2326 'xcode_settings': { |
| 2327 'CHROMIUM_STRIP_SAVE_FILE': '<(asan_saves_file)' | 2327 'CHROMIUM_STRIP_SAVE_FILE': '<(asan_saves_file)', |
| 2328 'DEAD_CODE_STRIPPING': 'NO', # -Wl,-dead_strip | |
| 2329 'OTHER_CFLAGS': [ | |
| 2330 '-fasan', | |
| 2331 '-faddress-sanitizer', | |
| 2332 '-w', | |
| 2333 ], | |
| 2334 'OTHER_LDFLAGS': [ | |
| 2335 '-fasan', | |
| 2336 '-faddress-sanitizer', | |
| 2337 # The symbols below are referenced in the ASan runtime | |
| 2338 # library (compiled on OS X 10.6), but may be unavailable | |
| 2339 # on the prior OS X versions. Because Chromium is currently | |
| 2340 # targeting 10.5.0, we need to explicitly mark these | |
| 2341 # symbols as dynamic_lookup. | |
| 2342 '-Wl,-U,_malloc_default_purgeable_zone', | |
| 2343 '-Wl,-U,_malloc_zone_memalign', | |
| 2344 '-Wl,-U,_dispatch_sync_f', | |
| 2345 '-Wl,-U,_dispatch_async_f', | |
| 2346 '-Wl,-U,_dispatch_barrier_async_f', | |
| 2347 '-Wl,-U,_dispatch_group_async_f', | |
| 2348 '-Wl,-U,_dispatch_after_f', | |
| 2349 | |
| 2350 ], | |
| 2328 }, | 2351 }, |
| 2352 'defines': [ | |
| 2353 'ADDRESS_SANITIZER', | |
| 2354 ], | |
| 2329 }], | 2355 }], |
| 2330 ], | 2356 ], |
| 2331 'target_conditions': [ | 2357 'target_conditions': [ |
| 2332 ['mac_pie==1 and release_valgrind_build==0', { | 2358 ['mac_pie==1 and release_valgrind_build==0', { |
| 2333 # Turn on position-independence (ASLR) for executables. When | 2359 # Turn on position-independence (ASLR) for executables. When |
| 2334 # PIE is on for the Chrome executables, the framework will | 2360 # PIE is on for the Chrome executables, the framework will |
| 2335 # also be subject to ASLR. | 2361 # also be subject to ASLR. |
| 2336 # Don't do this when building for Valgrind, because Valgrind | 2362 # Don't do this when building for Valgrind, because Valgrind |
| 2337 # doesn't understand slide. TODO: Make Valgrind on Mac OS X | 2363 # doesn't understand slide. TODO: Make Valgrind on Mac OS X |
| 2338 # understand slide, and get rid of the Valgrind check. | 2364 # understand slide, and get rid of the Valgrind check. |
| (...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2616 # settings in target dicts. SYMROOT is a special case, because many other | 2642 # settings in target dicts. SYMROOT is a special case, because many other |
| 2617 # Xcode variables depend on it, including variables such as | 2643 # Xcode variables depend on it, including variables such as |
| 2618 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 2644 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 2619 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 2645 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 2620 # files to appear (when present) in the UI as actual files and not red | 2646 # files to appear (when present) in the UI as actual files and not red |
| 2621 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 2647 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 2622 # and therefore SYMROOT, needs to be set at the project level. | 2648 # and therefore SYMROOT, needs to be set at the project level. |
| 2623 'SYMROOT': '<(DEPTH)/xcodebuild', | 2649 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 2624 }, | 2650 }, |
| 2625 } | 2651 } |
| OLD | NEW |