Enable DMP for system Chromium WebView on Android

base/allocator/allocator.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'jemalloc_dir': '../../third_party/jemalloc/chromium',
     'tcmalloc_dir': '../../third_party/tcmalloc/chromium',
     'use_vtable_verify%': 0,
   },
   'targets': [
     # Only executables and not libraries should depend on the
     # allocator target; only the application (the final executable)
     # knows what allocator makes sense.
     {
       'target_name': 'allocator',
       'type': 'static_library',
       # Make sure the allocation library is optimized to
       # the hilt in official builds.
       'variables': {
         'optimize': 'max',
+        'android_sdk_build%': 1,
       },
       'include_dirs': [
         '.',
         '<(tcmalloc_dir)/src/base',
         '<(tcmalloc_dir)/src',
         '../..',
       ],
       'direct_dependent_settings': {
         'configurations': {
           'Common_Base': {
@@ skipping 390 matching lines @@
             'ldflags': [
               # Don't let linker rip this symbol out, otherwise the heap&cpu
               # profilers will not initialize properly on startup.
               '-Wl,-uIsHeapProfilerRunning,-uProfilerStart',
               # Do the same for heap leak checker.
               '-Wl,-u_Z21InitialMallocHook_NewPKvj,-u_Z22InitialMallocHook_MMapPKvS0_jiiix,-u_Z22InitialMallocHook_SbrkPKvi',
               '-Wl,-u_Z21InitialMallocHook_NewPKvm,-u_Z22InitialMallocHook_MMapPKvS0_miiil,-u_Z22InitialMallocHook_SbrkPKvl',
               '-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 ANDROID_SDK_BUILD.. maybe
just remove that condition?

[mnaganov (inactive), 2013/07/15 12:34:01]

Sorry, I've uploaded a better version already. Torne has pointed out that
android_webview_build is actually the indicator for the build inside the Android
tree.

+          'defines': ['ANDROID_SDK_BUILD'],
+        }],
         [ 'use_vtable_verify==1', {
           'cflags': [
             '-fvtable-verify=preinit',
           ],
         }],
         [ 'linux_keep_shadow_stacks==1', {
           'sources': [
             '<(tcmalloc_dir)/src/linux_shadow_stacks.cc',
             '<(tcmalloc_dir)/src/linux_shadow_stacks.h',
             '<(tcmalloc_dir)/src/stacktrace_shadow-inl.h',
@@ skipping 220 matching lines @@
           'sources': [
             'type_profiler_map_unittests.cc',
             '<(tcmalloc_dir)/src/gperftools/type_profiler_map.h',
             '<(tcmalloc_dir)/src/type_profiler_map.cc',
           ],
         },
       ],
     }],
   ],
 }