Chromium Code Reviews| Index: base/allocator/allocator.gyp |
| diff --git a/base/allocator/allocator.gyp b/base/allocator/allocator.gyp |
| index 4febed2533dfdbe87cb1efb360fe6dd2406711ee..0d7ea57e32ba935f546de56ba23b830f723412f6 100644 |
| --- a/base/allocator/allocator.gyp |
| +++ b/base/allocator/allocator.gyp |
| @@ -19,6 +19,7 @@ |
| # the hilt in official builds. |
| 'variables': { |
| 'optimize': 'max', |
| + 'android_sdk_build%': 1, |
| }, |
| 'include_dirs': [ |
| '.', |
| @@ -429,6 +430,11 @@ |
| '-Wl,-u_ZN15HeapLeakChecker12IgnoreObjectEPKv,-u_ZN15HeapLeakChecker14UnIgnoreObjectEPKv', |
| ]}, |
| }], |
| + # Need to distinguish between SDK and non-SDK build for Android |
| + # due to differences in C include files. |
| + ['OS=="android" and android_use_tcmalloc==1 and android_sdk_build==1', { |
|
bulach
2013/07/15 12:31:59
hmm.. the "use_tcmalloc" seems a bit odd to toggle
mnaganov (inactive)
2013/07/15 12:34:01
Sorry, I've uploaded a better version already. Tor
|
| + 'defines': ['ANDROID_SDK_BUILD'], |
| + }], |
| [ 'use_vtable_verify==1', { |
| 'cflags': [ |
| '-fvtable-verify=preinit', |