summaryrefslogtreecommitdiffstats
path: root/base/allocator
diff options
context:
space:
mode:
authormnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-19 01:35:07 +0000
committermnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-19 01:35:07 +0000
commita2f57e2cbfffa257ef542aa44807ee5d616cd15d (patch)
tree1d7c36c4f9a399d21acc1e4847e29e25adf73f0d /base/allocator
parent7484f69f0abf650342a963424d3a6874483e9a17 (diff)
downloadchromium_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 'base/allocator')
-rw-r--r--base/allocator/allocator.gyp5
1 files changed, 5 insertions, 0 deletions
diff --git a/base/allocator/allocator.gyp b/base/allocator/allocator.gyp
index 4febed2..ef98d09 100644
--- a/base/allocator/allocator.gyp
+++ b/base/allocator/allocator.gyp
@@ -429,6 +429,11 @@
'-Wl,-u_ZN15HeapLeakChecker12IgnoreObjectEPKv,-u_ZN15HeapLeakChecker14UnIgnoreObjectEPKv',
]},
}],
+ # Need to distinguish a non-SDK build for Android WebView
+ # due to differences in C include files.
+ ['OS=="android" and android_webview_build==1', {
+ 'defines': ['ANDROID_NON_SDK_BUILD'],
+ }],
[ 'use_vtable_verify==1', {
'cflags': [
'-fvtable-verify=preinit',