diff options
| author | jungjik.lee@samsung.com <jungjik.lee@samsung.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-25 10:15:29 +0000 |
|---|---|---|
| committer | jungjik.lee@samsung.com <jungjik.lee@samsung.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-25 10:15:29 +0000 |
| commit | 6b0b4bdff331405340345d8be91ffced34ea35f7 (patch) | |
| tree | bfccb892ad58d3e1c8db25f4d8c897f632f4f11f | |
| parent | 7b2576b576831cb2a7a1f2a428e267db4eb46041 (diff) | |
| download | chromium_src-6b0b4bdff331405340345d8be91ffced34ea35f7.zip chromium_src-6b0b4bdff331405340345d8be91ffced34ea35f7.tar.gz chromium_src-6b0b4bdff331405340345d8be91ffced34ea35f7.tar.bz2 | |
Disable use_chromium_linker for profiler
if we use chromium_android_linker,
it excludes -finstrument-functions and removes profiling functions.
so that we couldn't see buckets data in deep-memory-profiler.
Bug=None
Review URL: https://codereview.chromium.org/346413003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@279662 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/chrome_android.gypi | 2 | ||||
| -rw-r--r-- | content/content_shell.gypi | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/chrome_android.gypi b/chrome/chrome_android.gypi index d986c57..6fdd27a 100644 --- a/chrome/chrome_android.gypi +++ b/chrome/chrome_android.gypi @@ -73,7 +73,7 @@ '<@(chrome_android_pak_output_resources)', ], 'conditions': [ - ['component != "shared_library" and target_arch != "arm64" and target_arch != "x64"', { + ['component != "shared_library" and target_arch != "arm64" and target_arch != "x64" and profiling_full_stack_frames != 1', { # Only enable the chromium linker on regular builds, since the # component build crashes on Android 4.4. See b/11379966 'use_chromium_linker': '1', diff --git a/content/content_shell.gypi b/content/content_shell.gypi index 743453b..39a7aab 100644 --- a/content/content_shell.gypi +++ b/content/content_shell.gypi @@ -1028,7 +1028,7 @@ '<(PRODUCT_DIR)/icudtl.dat', ], }], - ['component != "shared_library" and target_arch != "arm64" and target_arch != "x64"', { + ['component != "shared_library" and target_arch != "arm64" and target_arch != "x64" and profiling_full_stack_frames != 1', { # Only enable the chromium linker on regular builds, since the # component build crashes on Android 4.4. See b/11379966 'use_chromium_linker': '1', |