diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-04-28 17:10:06 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-04-28 17:10:06 +0000 |
| commit | a0e9e89bcb8d134659f859e0b9acfe9a1630d9a0 (patch) | |
| tree | 7a74ccd848c4d81afd410ce35cfc0fcce7619dc6 | |
| parent | 5a3abb7242051a7a28bd36c1c65ba82d118402ee (diff) | |
| parent | 359920658f4dab23d5e167cab8b7855a9f6688a0 (diff) | |
| download | gyp-a0e9e89bcb8d134659f859e0b9acfe9a1630d9a0.tar.gz | |
Merge third_party/skia/gyp from https://chromium.googlesource.com/external/skia/gyp.git at 359920658f4dab23d5e167cab8b7855a9f6688a0
This commit was generated by merge_from_chromium.py.
Change-Id: I9606109a4d006ba08a96c01cc73f2291b2d7389e
| -rw-r--r-- | common.gypi | 1 | ||||
| -rw-r--r-- | common_conditions.gypi | 2 | ||||
| -rw-r--r-- | gmslides.gypi | 1 | ||||
| -rw-r--r-- | pathops_unittest.gyp | 1 |
4 files changed, 5 insertions, 0 deletions
diff --git a/common.gypi b/common.gypi index 2a5bbd4..0846fef 100644 --- a/common.gypi +++ b/common.gypi @@ -12,6 +12,7 @@ 'target_defaults': { 'defines': [ + 'SK_INTERNAL', 'SK_GAMMA_SRGB', 'SK_GAMMA_APPLY_TO_A8', 'SK_SCALAR_TO_FLOAT_EXCLUDED', # temporary to allow Chrome to call SkFloatToScalar diff --git a/common_conditions.gypi b/common_conditions.gypi index 175b8b0..ed30245 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -309,6 +309,8 @@ 'SK_SUPPORT_LEGACY_BLURDRAWLOOPERCONSTRUCTORS', # Needed until we fix skbug.com/2440. 'SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG', + # Transitional, for deprecated SkCanvas::SaveFlags methods. + 'SK_ATTR_DEPRECATED=SK_NOTHING_ARG1', ], }], diff --git a/gmslides.gypi b/gmslides.gypi index 67a9adb..d4c6c1c 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -56,6 +56,7 @@ '../gm/cubicpaths.cpp', '../gm/cmykjpeg.cpp', '../gm/degeneratesegments.cpp', + '../gm/discard.cpp', '../gm/dashcubics.cpp', '../gm/dashing.cpp', '../gm/deviceproperties.cpp', diff --git a/pathops_unittest.gyp b/pathops_unittest.gyp index 87e125b..51af1e9 100644 --- a/pathops_unittest.gyp +++ b/pathops_unittest.gyp @@ -24,6 +24,7 @@ 'sources': [ '../tests/PathOpsAngleIdeas.cpp', '../tests/PathOpsDebug.cpp', + '../tests/PathOpsOpLoopThreadedTest.cpp', '../tests/PathOpsSkpClipTest.cpp', '../tests/Test.cpp', '../tests/skia_test.cpp', |