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

Unified Diff: build/common.gypi

Issue 1875173002: Reland of Enable allocator shim for Android (https://codereview.chromium.org/1875043003/) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix for LLVM libc++ 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/allocator/allocator_shim_internals.h ('k') | build/config/allocator.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 1aad50543073e54c931c7d8bad071c0df6d117bd..b11b96cb7b94a3251cbff789596fc5097696fd82 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -2260,7 +2260,7 @@
'use_allocator%': 'none',
'use_sanitizer_options%': 1,
}],
- ['OS=="linux" and asan==0 and msan==0 and lsan==0 and tsan==0 and build_for_tool==""', {
+ ['(OS=="linux" or OS=="android") and asan==0 and msan==0 and lsan==0 and tsan==0 and build_for_tool==""', {
'use_experimental_allocator_shim%': 1,
}],
['OS=="linux" and asan==0 and msan==0 and lsan==0 and tsan==0', {
« no previous file with comments | « base/allocator/allocator_shim_internals.h ('k') | build/config/allocator.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698