Chromium Code Reviews| Index: gyp/common_conditions.gypi |
| diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi |
| index fda122212c74689b6dbde46407e5bbb723503b53..a9823af3ea56643a395dd7e08985145b293cf2c7 100644 |
| --- a/gyp/common_conditions.gypi |
| +++ b/gyp/common_conditions.gypi |
| @@ -130,6 +130,17 @@ |
| '-Werror', |
| ], |
| }], |
| + [ 'skia_shared_lib', { |
| + 'cflags': [ |
| + '-fPIC', |
| + ], |
| + 'defines': [ |
| + 'GR_DLL=1', |
| + 'GR_IMPLEMENTATION=1', |
| + 'SKIA_DLL', |
| + 'SKIA_IMPLEMENTATION=1', |
| + ], |
| + }], |
|
djsollen
2013/05/30 20:35:29
remove this to make it clear that we don't support
|
| [ 'skia_arch_width == 64', { |
| 'cflags': [ |
| '-m64', |
| @@ -193,6 +204,19 @@ |
| ], |
| }, |
| }], |
| + [ 'skia_shared_lib', { |
| + 'xcode_settings': { |
| + 'OTHER_CPLUSPLUSFLAGS': [ |
| + '-fpic', |
| + ], |
| + }, |
| + 'defines': [ |
| + 'GR_DLL=1', |
| + 'GR_IMPLEMENTATION=1', |
| + 'SKIA_DLL', |
| + 'SKIA_IMPLEMENTATION=1', |
| + ], |
|
djsollen
2013/05/30 20:35:29
remove this to make it clear that we don't support
|
| + }], |
| ], |
| 'configurations': { |
| 'Debug': { |
| @@ -259,6 +283,19 @@ |
| ], |
| }, |
| }], |
| + [ 'skia_shared_lib', { |
| + 'xcode_settings': { |
| + 'OTHER_CPLUSPLUSFLAGS': [ |
| + '-fpic', |
| + ], |
| + }, |
| + 'defines': [ |
| + 'GR_DLL=1', |
| + 'GR_IMPLEMENTATION=1', |
| + 'SKIA_DLL', |
| + 'SKIA_IMPLEMENTATION=1', |
| + ], |
| + }], |
|
djsollen
2013/05/30 20:35:29
remove this to make it clear that we don't support
|
| ], |
| 'configurations': { |
| 'Debug': { |
| @@ -326,6 +363,17 @@ |
| [ 'skia_profile_enabled == 1', { |
| 'cflags': ['-g', '-fno-omit-frame-pointer', '-marm', '-mapcs'], |
| }], |
| + [ 'skia_shared_lib', { |
| + 'cflags': [ |
| + '-fPIC', |
| + ], |
| + 'defines': [ |
| + 'GR_DLL=1', |
| + 'GR_IMPLEMENTATION=1', |
| + 'SKIA_DLL', |
| + 'SKIA_IMPLEMENTATION=1', |
| + ], |
| + }], |
| [ 'skia_arch_type == "arm" and arm_thumb == 1', { |
| 'cflags': [ |
| '-mthumb', |