diff options
| author | Ben Murdoch <benm@google.com> | 2013-07-23 11:17:05 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2013-07-23 11:17:05 +0100 |
| commit | ca12bfac764ba476d6cd062bf1dde12cc64c3f40 (patch) | |
| tree | 1cd09db25ea5de98e73c8efbe572e103daee8b2b /android_webview/android_webview.gyp | |
| parent | fcb3e05bdd21d752df9c3dff28b6bbf29b5b733b (diff) | |
| download | chromium_org-ca12bfac764ba476d6cd062bf1dde12cc64c3f40.tar.gz | |
Merge from Chromium at DEPS revision r213057
This commit was generated by merge_to_master.py.
Change-Id: I3e2e2506eb9b0080157e9c5f133559df3e600388
Diffstat (limited to 'android_webview/android_webview.gyp')
| -rw-r--r-- | android_webview/android_webview.gyp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp index 90a134c091..68669ce482 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' |