Chromium Code Reviews| Index: base/allocator/allocator.gyp |
| diff --git a/base/allocator/allocator.gyp b/base/allocator/allocator.gyp |
| index 4febed2533dfdbe87cb1efb360fe6dd2406711ee..bc43f17d41d01c6c34868277acf9af52c1561a44 100644 |
| --- a/base/allocator/allocator.gyp |
| +++ b/base/allocator/allocator.gyp |
| @@ -429,6 +429,11 @@ |
| '-Wl,-u_ZN15HeapLeakChecker12IgnoreObjectEPKv,-u_ZN15HeapLeakChecker14UnIgnoreObjectEPKv', |
| ]}, |
| }], |
| + # Need to distinguish a non-SDK build for Android WebView |
| + # due to differences in C include files. |
| + ['OS=="android" and android_use_tcmalloc==1 and android_webview_build==1', { |
|
bulach
2013/07/15 12:36:24
I'd still suggest just dropping the "android_use_t
mnaganov (inactive)
2013/07/15 12:43:01
Currently it's needed for TCMalloc source files on
|
| + 'defines': ['ANDROID_NON_SDK_BUILD'], |
| + }], |
| [ 'use_vtable_verify==1', { |
| 'cflags': [ |
| '-fvtable-verify=preinit', |