Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2420)

Unified Diff: android_webview/android_webview.gyp

Issue 18314006: Enable DMP for system Chromium WebView on Android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Do not indent preprocessor directives Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | base/allocator/allocator.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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'
« no previous file with comments | « no previous file | base/allocator/allocator.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698