| 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 1905 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1916 }], | 1916 }], |
| 1917 ['clang==1 and clang_load!="" and clang_add_plugin!=""', { | 1917 ['clang==1 and clang_load!="" and clang_add_plugin!=""', { |
| 1918 'cflags': [ | 1918 'cflags': [ |
| 1919 '-Xclang', '-load', '-Xclang', '<(clang_load)', | 1919 '-Xclang', '-load', '-Xclang', '<(clang_load)', |
| 1920 '-Xclang', '-add-plugin', '-Xclang', '<(clang_add_plugin)', | 1920 '-Xclang', '-add-plugin', '-Xclang', '<(clang_add_plugin)', |
| 1921 ], | 1921 ], |
| 1922 }], | 1922 }], |
| 1923 ['asan==1', { | 1923 ['asan==1', { |
| 1924 # Only in the linux section for now, since ASAN doesn't | 1924 # Only in the linux section for now, since ASAN doesn't |
| 1925 # work on Mac yet. | 1925 # work on Mac yet. |
| 1926 » # TODO(glider): -fasan is deprecated. Remove it when we stop using | 1926 # TODO(glider): -fasan is deprecated. Remove it when we stop using |
| 1927 » # it. | 1927 # it. |
| 1928 'cflags': [ | 1928 'cflags': [ |
| 1929 '-fasan', | 1929 '-fasan', |
| 1930 » '-faddress-sanitizer', | 1930 '-faddress-sanitizer', |
| 1931 '-w', | 1931 '-w', |
| 1932 » '-DADDRESS_SANITIZER', | 1932 '-DADDRESS_SANITIZER', |
| 1933 ], | 1933 ], |
| 1934 'ldflags': [ | 1934 'ldflags': [ |
| 1935 '-fasan', | 1935 '-fasan', |
| 1936 » '-faddress-sanitizer', | 1936 '-faddress-sanitizer', |
| 1937 ], | 1937 ], |
| 1938 }], | 1938 }], |
| 1939 ['no_strict_aliasing==1', { | 1939 ['no_strict_aliasing==1', { |
| 1940 'cflags': [ | 1940 'cflags': [ |
| 1941 '-fno-strict-aliasing', | 1941 '-fno-strict-aliasing', |
| 1942 ], | 1942 ], |
| 1943 }], | 1943 }], |
| 1944 ['linux_breakpad==1', { | 1944 ['linux_breakpad==1', { |
| 1945 'cflags': [ '-g' ], | 1945 'cflags': [ '-g' ], |
| 1946 'defines': ['USE_LINUX_BREAKPAD'], | 1946 'defines': ['USE_LINUX_BREAKPAD'], |
| (...skipping 373 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2320 '>@(change_mach_o_flags_options)', | 2320 '>@(change_mach_o_flags_options)', |
| 2321 ], | 2321 ], |
| 2322 }, | 2322 }, |
| 2323 ], | 2323 ], |
| 2324 'conditions': [ | 2324 'conditions': [ |
| 2325 ['asan==1', { | 2325 ['asan==1', { |
| 2326 'variables': { | 2326 'variables': { |
| 2327 'asan_saves_file': 'asan.saves', | 2327 'asan_saves_file': 'asan.saves', |
| 2328 }, | 2328 }, |
| 2329 'xcode_settings': { | 2329 'xcode_settings': { |
| 2330 'CHROMIUM_STRIP_SAVE_FILE': '<(asan_saves_file)' | 2330 'CHROMIUM_STRIP_SAVE_FILE': '<(asan_saves_file)', |
| 2331 'OTHER_CFLAGS': [ |
| 2332 '-fasan', |
| 2333 '-faddress-sanitizer', |
| 2334 '-w', |
| 2335 ], |
| 2336 'OTHER_LDFLAGS': [ |
| 2337 '-fasan', |
| 2338 '-faddress-sanitizer', |
| 2339 # The symbols below are referenced in the ASan runtime |
| 2340 # library (compiled on OS X 10.6), but may be unavailable |
| 2341 # on the prior OS X versions. Because Chromium is currently |
| 2342 # targeting 10.5.0, we need to explicitly mark these |
| 2343 # symbols as dynamic_lookup. |
| 2344 '-Wl,-U,_malloc_default_purgeable_zone', |
| 2345 '-Wl,-U,_malloc_zone_memalign', |
| 2346 '-Wl,-U,_dispatch_sync_f', |
| 2347 '-Wl,-U,_dispatch_async_f', |
| 2348 '-Wl,-U,_dispatch_barrier_async_f', |
| 2349 '-Wl,-U,_dispatch_group_async_f', |
| 2350 '-Wl,-U,_dispatch_after_f', |
| 2351 |
| 2352 ], |
| 2331 }, | 2353 }, |
| 2354 'defines': [ |
| 2355 'ADDRESS_SANITIZER', |
| 2356 ], |
| 2332 }], | 2357 }], |
| 2333 ], | 2358 ], |
| 2334 'target_conditions': [ | 2359 'target_conditions': [ |
| 2335 ['mac_pie==1 and release_valgrind_build==0', { | 2360 ['mac_pie==1 and release_valgrind_build==0', { |
| 2336 # Turn on position-independence (ASLR) for executables. When | 2361 # Turn on position-independence (ASLR) for executables. When |
| 2337 # PIE is on for the Chrome executables, the framework will | 2362 # PIE is on for the Chrome executables, the framework will |
| 2338 # also be subject to ASLR. | 2363 # also be subject to ASLR. |
| 2339 # Don't do this when building for Valgrind, because Valgrind | 2364 # Don't do this when building for Valgrind, because Valgrind |
| 2340 # doesn't understand slide. TODO: Make Valgrind on Mac OS X | 2365 # doesn't understand slide. TODO: Make Valgrind on Mac OS X |
| 2341 # understand slide, and get rid of the Valgrind check. | 2366 # understand slide, and get rid of the Valgrind check. |
| (...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2619 # settings in target dicts. SYMROOT is a special case, because many other | 2644 # settings in target dicts. SYMROOT is a special case, because many other |
| 2620 # Xcode variables depend on it, including variables such as | 2645 # Xcode variables depend on it, including variables such as |
| 2621 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 2646 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 2622 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 2647 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 2623 # files to appear (when present) in the UI as actual files and not red | 2648 # files to appear (when present) in the UI as actual files and not red |
| 2624 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 2649 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 2625 # and therefore SYMROOT, needs to be set at the project level. | 2650 # and therefore SYMROOT, needs to be set at the project level. |
| 2626 'SYMROOT': '<(DEPTH)/xcodebuild', | 2651 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 2627 }, | 2652 }, |
| 2628 } | 2653 } |
| OLD | NEW |