diff options
| author | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-19 01:35:07 +0000 |
|---|---|---|
| committer | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-19 01:35:07 +0000 |
| commit | a2f57e2cbfffa257ef542aa44807ee5d616cd15d (patch) | |
| tree | 1d7c36c4f9a399d21acc1e4847e29e25adf73f0d /android_webview | |
| parent | 7484f69f0abf650342a963424d3a6874483e9a17 (diff) | |
| download | chromium_src-a2f57e2cbfffa257ef542aa44807ee5d616cd15d.zip chromium_src-a2f57e2cbfffa257ef542aa44807ee5d616cd15d.tar.gz chromium_src-a2f57e2cbfffa257ef542aa44807ee5d616cd15d.tar.bz2 | |
Enable DMP for system Chromium WebView on Android
A couple of tweaks are needed in order to enable
compiling inside the Android tree.
Review URL: https://chromiumcodereview.appspot.com/18314006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212490 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
| -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 90a134c..68669ce 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' |