2 files changed, 10 insertions, 1 deletions
diff --git a/common_conditions.gypi b/common_conditions.gypi
index e89d116..6ae76a6 100644
--- a/common_conditions.gypi
+++ b/common_conditions.gypi
@@ -412,6 +412,16 @@
                   }],
                 ],
               }],
+              [ 'skia_sanitizer == "undefined"', {
+                'cflags': [ '-fPIC' ],
+                'cflags_cc!': ['-fno-rtti'],
+                'target_conditions': [
+                  [ '_type == "executable"', {
+                    'cflags': [ '-fPIE' ],
+                    'ldflags': [ '-pie' ],
+                  }],
+                ],
+              }],
             ],
           }],
           [ 'skia_clang_build', {
diff --git a/core.gypi b/core.gypi
index 1bcde4c..b70508c 100644
--- a/core.gypi
+++ b/core.gypi
@@ -7,7 +7,6 @@
 #
 {
     'sources': [
-        '<(skia_src_path)/core/ARGB32_Clamp_Bilinear_BitmapShader.h',
         '<(skia_src_path)/core/SkAAClip.cpp',
         '<(skia_src_path)/core/SkAnnotation.cpp',
         '<(skia_src_path)/core/SkAdvancedTypefaceMetrics.cpp',