Index: gyp/common_conditions.gypi |
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi |
index d03dfb00a6cea198a7a3e59d5f8814a29208fb01..51b44505b836071ec4545b0f462449314260cf51 100644 |
--- a/gyp/common_conditions.gypi |
+++ b/gyp/common_conditions.gypi |
@@ -8,6 +8,11 @@ |
'SK_FORCE_DISTANCEFIELD_FONTS=<(skia_force_distancefield_fonts)', |
], |
'conditions' : [ |
+ ['skia_pic', { |
+ 'cflags': [ |
+ '-fPIC', |
+ ], |
+ }], |
[ 'skia_arch_type == "arm64"', { |
'cflags': [ |
'-ffp-contract=off', |
@@ -403,9 +408,6 @@ |
}, |
'conditions' : [ |
[ 'skia_shared_lib', { |
- 'cflags': [ |
- '-fPIC', |
- ], |
'defines': [ |
'SKIA_DLL', |
'SKIA_IMPLEMENTATION=1', |
@@ -449,7 +451,6 @@ |
'conditions' : [ |
[ 'skia_sanitizer == "thread"', { |
'defines': [ 'SK_DYNAMIC_ANNOTATIONS_ENABLED=1' ], |
- 'cflags': [ '-fPIC' ], |
'target_conditions': [ |
[ '_type == "executable"', { |
mtklein
2014/07/19 14:49:19
Can we make skia_pic imply PIE executables too, or
djsollen
2014/07/22 14:20:17
We need PIE for android executables as well. The
scroggo
2014/07/22 14:53:36
(Derek and I discussed in person, but for posterit
|
'cflags': [ '-fPIE' ], |
@@ -458,7 +459,6 @@ |
], |
}], |
[ 'skia_sanitizer == "undefined"', { |
- 'cflags': [ '-fPIC' ], |
'cflags_cc!': ['-fno-rtti'], |
'target_conditions': [ |
[ '_type == "executable"', { |
@@ -664,9 +664,6 @@ |
], |
}], |
[ 'skia_shared_lib', { |
- 'cflags': [ |
- '-fPIC', |
- ], |
'defines': [ |
'SKIA_DLL', |
'SKIA_IMPLEMENTATION=1', |