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

Unified Diff: base/allocator/allocator.gyp

Issue 18314006: Enable DMP for system Chromium WebView on Android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Using a compiler define for detecting build type 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 | « android_webview/android_webview.gyp ('k') | build/android/envsetup_functions.sh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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',
« no previous file with comments | « android_webview/android_webview.gyp ('k') | build/android/envsetup_functions.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698