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

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

Issue 110333004: Revert 240682 "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++/LICENSE.TXT » ('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 549 matching lines...) Expand 10 before | Expand all | Expand 10 after
937 'input_speech%': '<(input_speech)', 932 'input_speech%': '<(input_speech)',
938 'notifications%': '<(notifications)', 933 'notifications%': '<(notifications)',
939 'clang_use_chrome_plugins%': '<(clang_use_chrome_plugins)', 934 'clang_use_chrome_plugins%': '<(clang_use_chrome_plugins)',
940 'mac_want_real_dsym%': '<(mac_want_real_dsym)', 935 'mac_want_real_dsym%': '<(mac_want_real_dsym)',
941 'asan%': '<(asan)', 936 'asan%': '<(asan)',
942 'lsan%': '<(lsan)', 937 'lsan%': '<(lsan)',
943 'msan%': '<(msan)', 938 'msan%': '<(msan)',
944 'tsan%': '<(tsan)', 939 'tsan%': '<(tsan)',
945 'tsan_blacklist%': '<(tsan_blacklist)', 940 'tsan_blacklist%': '<(tsan_blacklist)',
946 'use_instrumented_libraries%': '<(use_instrumented_libraries)', 941 'use_instrumented_libraries%': '<(use_instrumented_libraries)',
947 'use_custom_libcxx%': '<(use_custom_libcxx)',
948 'clang_type_profiler%': '<(clang_type_profiler)', 942 'clang_type_profiler%': '<(clang_type_profiler)',
949 'order_profiling%': '<(order_profiling)', 943 'order_profiling%': '<(order_profiling)',
950 'order_text_section%': '<(order_text_section)', 944 'order_text_section%': '<(order_text_section)',
951 'enable_extensions%': '<(enable_extensions)', 945 'enable_extensions%': '<(enable_extensions)',
952 'enable_plugin_installation%': '<(enable_plugin_installation)', 946 'enable_plugin_installation%': '<(enable_plugin_installation)',
953 'enable_plugins%': '<(enable_plugins)', 947 'enable_plugins%': '<(enable_plugins)',
954 'enable_session_service%': '<(enable_session_service)', 948 'enable_session_service%': '<(enable_session_service)',
955 'enable_themes%': '<(enable_themes)', 949 'enable_themes%': '<(enable_themes)',
956 'enable_autofill_dialog%': '<(enable_autofill_dialog)', 950 'enable_autofill_dialog%': '<(enable_autofill_dialog)',
957 'enable_background%': '<(enable_background)', 951 'enable_background%': '<(enable_background)',
(...skipping 2564 matching lines...) Expand 10 before | Expand all | Expand 10 after
3522 ['_toolset=="target"', { 3516 ['_toolset=="target"', {
3523 'ldflags': [ 3517 'ldflags': [
3524 '-Wl,-R,\$$ORIGIN/instrumented_libraries/msan/lib/:\$$ORIG IN/instrumented_libraries/msan/usr/lib/x86_64-linux-gnu/', 3518 '-Wl,-R,\$$ORIGIN/instrumented_libraries/msan/lib/:\$$ORIG IN/instrumented_libraries/msan/usr/lib/x86_64-linux-gnu/',
3525 '-Wl,-z,origin', 3519 '-Wl,-z,origin',
3526 ], 3520 ],
3527 }], 3521 }],
3528 ], 3522 ],
3529 }], 3523 }],
3530 ], 3524 ],
3531 }], 3525 }],
3532 ['use_custom_libcxx==1', {
3533 'dependencies': [
3534 '<(DEPTH)/third_party/libc++/libc++.gyp:libc++',
3535 '<(DEPTH)/third_party/libc++abi/libc++abi.gyp:libc++abi',
3536 ],
3537 }],
3538 ['order_profiling!=0 and (chromeos==1 or OS=="linux" or OS=="android") ', { 3526 ['order_profiling!=0 and (chromeos==1 or OS=="linux" or OS=="android") ', {
3539 'target_conditions' : [ 3527 'target_conditions' : [
3540 ['_toolset=="target"', { 3528 ['_toolset=="target"', {
3541 'cflags': [ 3529 'cflags': [
3542 '-finstrument-functions', 3530 '-finstrument-functions',
3543 # Allow mmx intrinsics to inline, so that the 3531 # Allow mmx intrinsics to inline, so that the
3544 #0 compiler can expand the intrinsics. 3532 #0 compiler can expand the intrinsics.
3545 '-finstrument-functions-exclude-file-list=mmintrin.h', 3533 '-finstrument-functions-exclude-file-list=mmintrin.h',
3546 ], 3534 ],
3547 }], 3535 }],
(...skipping 1253 matching lines...) Expand 10 before | Expand all | Expand 10 after
4801 # settings in target dicts. SYMROOT is a special case, because many other 4789 # settings in target dicts. SYMROOT is a special case, because many other
4802 # Xcode variables depend on it, including variables such as 4790 # Xcode variables depend on it, including variables such as
4803 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4791 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4804 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4792 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4805 # files to appear (when present) in the UI as actual files and not red 4793 # files to appear (when present) in the UI as actual files and not red
4806 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4794 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4807 # and therefore SYMROOT, needs to be set at the project level. 4795 # and therefore SYMROOT, needs to be set at the project level.
4808 'SYMROOT': '<(DEPTH)/xcodebuild', 4796 'SYMROOT': '<(DEPTH)/xcodebuild',
4809 }, 4797 },
4810 } 4798 }
OLDNEW
« no previous file with comments | « trunk/src/DEPS ('k') | trunk/src/third_party/libc++/LICENSE.TXT » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698