| Index: gyp/common_conditions.gypi
|
| diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi
|
| index 0b3e35863c4780c5971a482c066971fdd6a25a1b..65ef9ed8b7fd977c2fdaef56a1f232266b16efd3 100644
|
| --- a/gyp/common_conditions.gypi
|
| +++ b/gyp/common_conditions.gypi
|
| @@ -10,7 +10,7 @@
|
| 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)',
|
| 'SK_SUPPORT_GPU=<(skia_gpu)',
|
| 'SK_FORCE_DISTANCE_FIELD_TEXT=<(skia_force_distance_field_text)',
|
| -
|
| +
|
| # Indicate that all dependency libraries are present. Clients that
|
| # are missing some of the required decoding libraries may choose
|
| # not to define these. This will disable some decoder and encoder
|
| @@ -630,14 +630,10 @@
|
| 'defines': [
|
| 'SK_BUILD_FOR_ANDROID',
|
|
|
| - # Android Text Tuning
|
| + # Android defines a fixed text gamma exponent instead of using SRGB
|
| 'SK_GAMMA_EXPONENT=1.4',
|
| 'SK_GAMMA_CONTRAST=0.0',
|
| ],
|
| - # Android defines a fixed gamma exponent instead of using SRGB
|
| - 'defines!': [
|
| - 'SK_GAMMA_SRGB',
|
| - ],
|
| 'configurations': {
|
| 'Release': {
|
| 'cflags': ['-O2'],
|
|
|