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

Unified Diff: build/common.gypi

Issue 1719433002: Introduce allocator shim for Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@shim_traceintegration
Patch Set: android host toolchain 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
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 871daa551a522b65f0a45dbe79300474682e86ef..a838102da3610a915a4f7fd71c2868e6fcee80d1 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -2261,7 +2261,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', {

Powered by Google App Engine
This is Rietveld 408576698