Build Android with SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG.

Build Android with SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG.

This flag will be used on Android when built for the framework,
as well as when built for the WebView. Setting this flag for
Android means our tests can fully test CanvasStateTest.

Fix CanvasStateTest. It has bit-rotted since disabling
SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG.

Splitting off from https://codereview.chromium.org/372003002/ ,
as it seems self-contained.

BUG=b/15693384

Committed: https://skia.googlesource.com/skia/+/ecce60bad6e3b7a72e1eba820bc3be15d39a1c21

[reed1, 2014-07-08 19:09:30]

lgtm

[djsollen, 2014-07-08 19:51:05]

lgtm

[scroggo, 2014-07-09 13:57:26]

The CQ bit was checked by scroggo@google.com

[commit-bot: I haz the power, 2014-07-09 13:58:28]

CQ is trying da patch. Follow status at
 https://skia-tree-status.appspot.com/cq/scroggo@google.com/375943003/1

[commit-bot: I haz the power, 2014-07-09 13:58:29]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-07-09 13:58:30]

Failed to apply patch for gyp/common_conditions.gypi:
While running git apply --index -p1;
  error: patch failed: gyp/common_conditions.gypi:373
  error: gyp/common_conditions.gypi: patch does not apply

Patch:       gyp/common_conditions.gypi
Index: gyp/common_conditions.gypi
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi
index
5965927660bac9331248bc09415899d4063ad95b..0708f7d7e2a0d0d3d36159f52ba8d991146852d0
100644
--- a/gyp/common_conditions.gypi
+++ b/gyp/common_conditions.gypi
@@ -373,8 +373,6 @@
         'SK_MUTEX_PLATFORM_H "../../src/ports/SkMutex_pthread.h"',
         # Still need to switch Android to the new name for N32.
         'kNative_8888_SkColorType kN32_SkColorType',
-        # Needed until we fix skbug.com/2440.
-        'SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG',
         # Transitional, for deprecated SkCanvas::SaveFlags methods.
         'SK_ATTR_DEPRECATED=SK_NOTHING_ARG1',
         'SK_SUPPORT_LEGACY_SHADER_LOCALMATRIX',
@@ -674,6 +672,8 @@
             'defines': [
               'SKIA_DLL',
               'SKIA_IMPLEMENTATION=1',
+              # Needed until we fix skbug.com/2440.
+              'SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG',
             ],
           }],
           [ 'skia_profile_enabled == 1', {

[scroggo, 2014-07-09 14:01:01]

The CQ bit was checked by scroggo@google.com

[commit-bot: I haz the power, 2014-07-09 14:01:28]

CQ is trying da patch. Follow status at
 https://skia-tree-status.appspot.com/cq/scroggo@google.com/375943003/20001

[commit-bot: I haz the power, 2014-07-09 14:26:49]

Change committed as ecce60bad6e3b7a72e1eba820bc3be15d39a1c21