diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-05-02 17:30:38 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-05-02 17:30:38 +0000 |
| commit | d8c21a503a174334dab5618ccccda9e9b288813c (patch) | |
| tree | 74573be769c9a6372beda5ce6f15e0b31a424201 | |
| parent | 6e07e1e3067db119e10557e50c1c5063a61ab1a7 (diff) | |
| parent | ca4311e9500734c101a5d63666fe1a0fbca2c630 (diff) | |
| download | gyp-d8c21a503a174334dab5618ccccda9e9b288813c.tar.gz | |
Merge third_party/skia/gyp from https://chromium.googlesource.com/external/skia/gyp.git at ca4311e9500734c101a5d63666fe1a0fbca2c630
This commit was generated by merge_from_chromium.py.
Change-Id: I9978d4ac74c94c34366cd89476a59756b5c6a567
| -rw-r--r-- | common_conditions.gypi | 10 | ||||
| -rw-r--r-- | core.gypi | 1 |
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', { @@ -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', |