diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi
index d6154caee3..8241f1830c 100644
--- a/gyp/common_conditions.gypi
+++ b/gyp/common_conditions.gypi
@@ -280,7 +280,6 @@
           [ 'skia_sanitizer', {
             'cflags': [
               '-fsanitize=<(skia_sanitizer)',
-              '-fno-omit-frame-pointer',
             ],
             'ldflags': [
               '-fsanitize=<(skia_sanitizer)',
@@ -304,6 +303,9 @@
               '-Wstring-conversion',
             ],
           }],
+          [ 'skia_keep_frame_pointer', {
+            'cflags': [ '-fno-omit-frame-pointer' ],
+          }],
         ],
       },
     ],
diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi
index 9aeee62f9d..579ce70537 100644
--- a/gyp/common_variables.gypi
+++ b/gyp/common_variables.gypi
@@ -120,8 +120,10 @@
       }],
       [ 'skia_sanitizer', {
         'skia_clang_build': 1,
+        'skia_keep_frame_pointer': 1,
       }, {
         'skia_clang_build%': 0,
+        'skia_keep_frame_pointer%': 0,
       }],
     ],