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

Side by Side Diff: build/common.gypi

Issue 1881523003: Revert of Enable allocator shim for Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@androidexp
Patch Set: Created 4 years, 8 months 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
« no previous file with comments | « base/allocator/README.md ('k') | build/config/allocator.gni » ('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 2243 matching lines...) Expand 10 before | Expand all | Expand 10 after
2254 # If you change these, also change build/config/clang/BUILD.gn. 2254 # If you change these, also change build/config/clang/BUILD.gn.
2255 'clang_chrome_plugins_flags%': 2255 'clang_chrome_plugins_flags%':
2256 '<(clang_dynlib_flags)' 2256 '<(clang_dynlib_flags)'
2257 '-Xclang -add-plugin -Xclang find-bad-constructs <(clang_plugin_args)' , 2257 '-Xclang -add-plugin -Xclang find-bad-constructs <(clang_plugin_args)' ,
2258 }], 2258 }],
2259 ['asan==1 or msan==1 or lsan==1 or tsan==1', { 2259 ['asan==1 or msan==1 or lsan==1 or tsan==1', {
2260 'clang%': 1, 2260 'clang%': 1,
2261 'use_allocator%': 'none', 2261 'use_allocator%': 'none',
2262 'use_sanitizer_options%': 1, 2262 'use_sanitizer_options%': 1,
2263 }], 2263 }],
2264 ['(OS=="linux" or OS=="android") and asan==0 and msan==0 and lsan==0 and t san==0 and build_for_tool==""', { 2264 ['OS=="linux" and asan==0 and msan==0 and lsan==0 and tsan==0 and build_fo r_tool==""', {
2265 'use_experimental_allocator_shim%': 1, 2265 'use_experimental_allocator_shim%': 1,
2266 }], 2266 }],
2267 ['OS=="linux" and asan==0 and msan==0 and lsan==0 and tsan==0', { 2267 ['OS=="linux" and asan==0 and msan==0 and lsan==0 and tsan==0', {
2268 # PNaCl toolchain Non-SFI build only supports linux OS build. 2268 # PNaCl toolchain Non-SFI build only supports linux OS build.
2269 # Also, it does not support sanitizers. 2269 # Also, it does not support sanitizers.
2270 'enable_nacl_nonsfi_test%': 1, 2270 'enable_nacl_nonsfi_test%': 1,
2271 }], 2271 }],
2272 ['asan==1 and OS=="linux" and chromeos==0', { 2272 ['asan==1 and OS=="linux" and chromeos==0', {
2273 'use_custom_libcxx%': 1, 2273 'use_custom_libcxx%': 1,
2274 }], 2274 }],
(...skipping 4088 matching lines...) Expand 10 before | Expand all | Expand 10 after
6363 # settings in target dicts. SYMROOT is a special case, because many other 6363 # settings in target dicts. SYMROOT is a special case, because many other
6364 # Xcode variables depend on it, including variables such as 6364 # Xcode variables depend on it, including variables such as
6365 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 6365 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
6366 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 6366 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
6367 # files to appear (when present) in the UI as actual files and not red 6367 # files to appear (when present) in the UI as actual files and not red
6368 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 6368 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
6369 # and therefore SYMROOT, needs to be set at the project level. 6369 # and therefore SYMROOT, needs to be set at the project level.
6370 'SYMROOT': '<(DEPTH)/xcodebuild', 6370 'SYMROOT': '<(DEPTH)/xcodebuild',
6371 }, 6371 },
6372 } 6372 }
OLDNEW
« no previous file with comments | « base/allocator/README.md ('k') | build/config/allocator.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698