Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(10)

Unified Diff: gyp/common_conditions.gypi

Issue 400043003: Run CanvasState test across a library boundary. (Closed) Base URL: https://skia.googlesource.com/skia.git@canvasState2
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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',

Powered by Google App Engine
This is Rietveld 408576698