Index: android_webview/android_webview.gyp |
diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp |
index 90a134c091d2859b15289193dfa359d2f261a8ae..68669ce482fb4bc9496b15eab13059b89ac69d14 100644 |
--- a/android_webview/android_webview.gyp |
+++ b/android_webview/android_webview.gyp |
@@ -16,6 +16,15 @@ |
'dependencies': [ |
'android_webview_common', |
], |
+ 'conditions': [ |
+ # The general approach is to allow the executable target to choose |
+ # the allocator, but as in the WebView case we are building a library |
+ # only, put the dependency on the allocator here |
+ [ 'android_webview_build==1 and android_use_tcmalloc==1', { |
+ 'dependencies': [ |
+ '../base/allocator/allocator.gyp:allocator', ], |
+ }], |
+ ], |
'ldflags': [ |
# fix linking to hidden symbols and re-enable this (crbug.com/157326) |
'-Wl,--no-fatal-warnings' |