Index: build/common.gypi |
diff --git a/build/common.gypi b/build/common.gypi |
index 99adeb0b28b4d8ec3f7556c817f10b50a6d5124f..0d814a87cc683c7bf5c77b3d0b1fa3711c9ea4e7 100644 |
--- a/build/common.gypi |
+++ b/build/common.gypi |
@@ -3435,7 +3435,6 @@ |
'debug_optimize%': 's', |
}, |
'cflags': [ |
- '-fomit-frame-pointer', |
'-fdata-sections', |
'-ffunction-sections', |
], |
@@ -3444,6 +3443,14 @@ |
'-Wl,--as-needed', |
], |
}], |
+ ['OS=="android" and android_full_debug==0 and target_arch!="arm64"', { |
+ # We don't omit frame pointers on arm64 since they are required |
+ # to correctly unwind stackframes which contain system library |
+ # function frames (crbug.com/391706). |
+ 'cflags': [ |
+ '-fomit-frame-pointer', |
+ ], |
+ }], |
['OS=="linux" and target_arch=="ia32"', { |
'ldflags': [ |
'-Wl,--no-as-needed', |
@@ -3499,13 +3506,18 @@ |
'-Wl,--gc-sections', |
], |
}], |
+ ['OS=="android" and target_arch!="arm64"', { |
+ # We don't omit frame pointers on arm64 since they are required |
+ # to correctly unwind stackframes which contain system library |
+ # function frames (crbug.com/391706). |
+ 'cflags': [ |
+ '-fomit-frame-pointer', |
+ ] |
+ }], |
['OS=="android"', { |
'variables': { |
'release_optimize%': 's', |
}, |
- 'cflags': [ |
- '-fomit-frame-pointer', |
- ], |
'ldflags': [ |
# Warn in case of text relocations. |
'-Wl,--warn-shared-textrel', |