Index: gyp/common_conditions.gypi |
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi |
index 4bbacec1e9997f36bd814f5ccb94c3bd73e6d945..13ae2923afa90ed618e767427ae9fbf470c29f16 100644 |
--- a/gyp/common_conditions.gypi |
+++ b/gyp/common_conditions.gypi |
@@ -10,6 +10,11 @@ |
'SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG', |
], |
'conditions' : [ |
+ ['skia_pic', { |
scroggo
2014/07/18 19:31:02
Ignore these; I've pulled them into a separate CL
|
+ 'cflags': [ |
+ '-fPIC', |
+ ], |
+ }], |
[ 'skia_arch_type == "arm64"', { |
'cflags': [ |
'-ffp-contract=off', |
@@ -405,9 +410,6 @@ |
}, |
'conditions' : [ |
[ 'skia_shared_lib', { |
- 'cflags': [ |
- '-fPIC', |
- ], |
'defines': [ |
'SKIA_DLL', |
'SKIA_IMPLEMENTATION=1', |
@@ -451,7 +453,6 @@ |
'conditions' : [ |
[ 'skia_sanitizer == "thread"', { |
'defines': [ 'SK_DYNAMIC_ANNOTATIONS_ENABLED=1' ], |
- 'cflags': [ '-fPIC' ], |
'target_conditions': [ |
[ '_type == "executable"', { |
'cflags': [ '-fPIE' ], |
@@ -460,7 +461,6 @@ |
], |
}], |
[ 'skia_sanitizer == "undefined"', { |
- 'cflags': [ '-fPIC' ], |
'cflags_cc!': ['-fno-rtti'], |
'target_conditions': [ |
[ '_type == "executable"', { |
@@ -666,9 +666,6 @@ |
], |
}], |
[ 'skia_shared_lib', { |
- 'cflags': [ |
- '-fPIC', |
- ], |
'defines': [ |
'SKIA_DLL', |
'SKIA_IMPLEMENTATION=1', |