Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(236)

Side by Side Diff: trunk/src/build/common.gypi

Issue 118243004: Revert 241574 "Add libc++ and libc++abi to third-party." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « trunk/src/DEPS ('k') | trunk/src/third_party/libc++/OWNERS » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 352 matching lines...) Expand 10 before | Expand all | Expand 10 after
363 363
364 # Enable building with MSAN (Clang's -fsanitize=memory option). 364 # Enable building with MSAN (Clang's -fsanitize=memory option).
365 # MemorySanitizer only works with clang, but msan=1 implies clang=1 365 # MemorySanitizer only works with clang, but msan=1 implies clang=1
366 # See http://clang.llvm.org/docs/MemorySanitizer.html 366 # See http://clang.llvm.org/docs/MemorySanitizer.html
367 'msan%': 0, 367 'msan%': 0,
368 368
369 # Use the dynamic libraries instrumented by one of the sanitizers 369 # Use the dynamic libraries instrumented by one of the sanitizers
370 # instead of the standard system libraries. 370 # instead of the standard system libraries.
371 'use_instrumented_libraries%': 0, 371 'use_instrumented_libraries%': 0,
372 372
373 # Use libc++ (third_party/libc++ and third_party/libc++abi) instead of
374 # stdlibc++ as standard library. This is intended to use for instrumented
375 # builds.
376 'use_custom_libcxx%': 0,
377
378 # Use a modified version of Clang to intercept allocated types and sizes 373 # Use a modified version of Clang to intercept allocated types and sizes
379 # for allocated objects. clang_type_profiler=1 implies clang=1. 374 # for allocated objects. clang_type_profiler=1 implies clang=1.
380 # See http://dev.chromium.org/developers/deep-memory-profiler/cpp-object-t ype-identifier 375 # See http://dev.chromium.org/developers/deep-memory-profiler/cpp-object-t ype-identifier
381 # TODO(dmikurube): Support mac. See http://crbug.com/123758#c11 376 # TODO(dmikurube): Support mac. See http://crbug.com/123758#c11
382 'clang_type_profiler%': 0, 377 'clang_type_profiler%': 0,
383 378
384 # Set to true to instrument the code with function call logger. 379 # Set to true to instrument the code with function call logger.
385 # See src/third_party/cygprofile/cyg-profile.cc for details. 380 # See src/third_party/cygprofile/cyg-profile.cc for details.
386 'order_profiling%': 0, 381 'order_profiling%': 0,
387 382
(...skipping 545 matching lines...) Expand 10 before | Expand all | Expand 10 after
933 'input_speech%': '<(input_speech)', 928 'input_speech%': '<(input_speech)',
934 'notifications%': '<(notifications)', 929 'notifications%': '<(notifications)',
935 'clang_use_chrome_plugins%': '<(clang_use_chrome_plugins)', 930 'clang_use_chrome_plugins%': '<(clang_use_chrome_plugins)',
936 'mac_want_real_dsym%': '<(mac_want_real_dsym)', 931 'mac_want_real_dsym%': '<(mac_want_real_dsym)',
937 'asan%': '<(asan)', 932 'asan%': '<(asan)',
938 'lsan%': '<(lsan)', 933 'lsan%': '<(lsan)',
939 'msan%': '<(msan)', 934 'msan%': '<(msan)',
940 'tsan%': '<(tsan)', 935 'tsan%': '<(tsan)',
941 'tsan_blacklist%': '<(tsan_blacklist)', 936 'tsan_blacklist%': '<(tsan_blacklist)',
942 'use_instrumented_libraries%': '<(use_instrumented_libraries)', 937 'use_instrumented_libraries%': '<(use_instrumented_libraries)',
943 'use_custom_libcxx%': '<(use_custom_libcxx)',
944 'clang_type_profiler%': '<(clang_type_profiler)', 938 'clang_type_profiler%': '<(clang_type_profiler)',
945 'order_profiling%': '<(order_profiling)', 939 'order_profiling%': '<(order_profiling)',
946 'order_text_section%': '<(order_text_section)', 940 'order_text_section%': '<(order_text_section)',
947 'enable_extensions%': '<(enable_extensions)', 941 'enable_extensions%': '<(enable_extensions)',
948 'enable_plugin_installation%': '<(enable_plugin_installation)', 942 'enable_plugin_installation%': '<(enable_plugin_installation)',
949 'enable_plugins%': '<(enable_plugins)', 943 'enable_plugins%': '<(enable_plugins)',
950 'enable_session_service%': '<(enable_session_service)', 944 'enable_session_service%': '<(enable_session_service)',
951 'enable_themes%': '<(enable_themes)', 945 'enable_themes%': '<(enable_themes)',
952 'enable_autofill_dialog%': '<(enable_autofill_dialog)', 946 'enable_autofill_dialog%': '<(enable_autofill_dialog)',
953 'enable_background%': '<(enable_background)', 947 'enable_background%': '<(enable_background)',
(...skipping 2562 matching lines...) Expand 10 before | Expand all | Expand 10 after
3516 ['_toolset=="target"', { 3510 ['_toolset=="target"', {
3517 'ldflags': [ 3511 'ldflags': [
3518 '-Wl,-R,\$$ORIGIN/instrumented_libraries/msan/lib/:\$$ORIG IN/instrumented_libraries/msan/usr/lib/x86_64-linux-gnu/', 3512 '-Wl,-R,\$$ORIGIN/instrumented_libraries/msan/lib/:\$$ORIG IN/instrumented_libraries/msan/usr/lib/x86_64-linux-gnu/',
3519 '-Wl,-z,origin', 3513 '-Wl,-z,origin',
3520 ], 3514 ],
3521 }], 3515 }],
3522 ], 3516 ],
3523 }], 3517 }],
3524 ], 3518 ],
3525 }], 3519 }],
3526 ['use_custom_libcxx==1', {
3527 'dependencies': [
3528 '<(DEPTH)/third_party/libc++/libc++.gyp:libc++',
3529 '<(DEPTH)/third_party/libc++abi/libc++abi.gyp:libc++abi',
3530 ],
3531 }],
3532 ['order_profiling!=0 and (chromeos==1 or OS=="linux" or OS=="android") ', { 3520 ['order_profiling!=0 and (chromeos==1 or OS=="linux" or OS=="android") ', {
3533 'target_conditions' : [ 3521 'target_conditions' : [
3534 ['_toolset=="target"', { 3522 ['_toolset=="target"', {
3535 'cflags': [ 3523 'cflags': [
3536 '-finstrument-functions', 3524 '-finstrument-functions',
3537 # Allow mmx intrinsics to inline, so that the 3525 # Allow mmx intrinsics to inline, so that the
3538 #0 compiler can expand the intrinsics. 3526 #0 compiler can expand the intrinsics.
3539 '-finstrument-functions-exclude-file-list=mmintrin.h', 3527 '-finstrument-functions-exclude-file-list=mmintrin.h',
3540 ], 3528 ],
3541 }], 3529 }],
(...skipping 1253 matching lines...) Expand 10 before | Expand all | Expand 10 after
4795 # settings in target dicts. SYMROOT is a special case, because many other 4783 # settings in target dicts. SYMROOT is a special case, because many other
4796 # Xcode variables depend on it, including variables such as 4784 # Xcode variables depend on it, including variables such as
4797 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4785 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4798 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4786 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4799 # files to appear (when present) in the UI as actual files and not red 4787 # files to appear (when present) in the UI as actual files and not red
4800 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4788 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4801 # and therefore SYMROOT, needs to be set at the project level. 4789 # and therefore SYMROOT, needs to be set at the project level.
4802 'SYMROOT': '<(DEPTH)/xcodebuild', 4790 'SYMROOT': '<(DEPTH)/xcodebuild',
4803 }, 4791 },
4804 } 4792 }
OLDNEW
« no previous file with comments | « trunk/src/DEPS ('k') | trunk/src/third_party/libc++/OWNERS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698