commit dbcfb1c7df95eab517a6ad3937a1f138dcdffe38
author commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Sep 26 15:16:12 2013 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Sep 26 15:16:12 2013 +0000
tree ba82a80cdfc09cc2ad4cd4ebcc2be5490d3eddc3
parent 8a37716ca8a9f9b79216369d77c3d51983db05eb

We don't flatten or unflatten SkPaintOptionsAndroid.  Reproduce and fix.

BUG=skia:1625
R=djsollen@google.com, reed@google.com

Author: mtklein@google.com

Review URL: https://chromiumcodereview.appspot.com/24075010

git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@11472 2bbb7eff-a529-9590-31e7-b0007b416f81

core.gyp

diff --git a/core.gyp b/core.gyp
index 7d322a6..2639ff4 100644
--- a/core.gyp
+++ b/core.gyp
@@ -76,9 +76,6 @@
           ],
         }],
         [ 'skia_os == "android"', {
-          'sources': [
-            '../src/core/SkPaintOptionsAndroid.cpp',
-          ],
           'dependencies': [
             'android_deps.gyp:cpu_features',
           ],

core.gypi

diff --git a/core.gypi b/core.gypi
index 3b57699..01e5243 100644
--- a/core.gypi
+++ b/core.gypi
@@ -119,6 +119,7 @@
         '<(skia_src_path)/core/SkOrderedWriteBuffer.cpp',
         '<(skia_src_path)/core/SkPackBits.cpp',
         '<(skia_src_path)/core/SkPaint.cpp',
+        '<(skia_src_path)/core/SkPaintOptionsAndroid.cpp',
         '<(skia_src_path)/core/SkPaintPriv.cpp',
         '<(skia_src_path)/core/SkPaintPriv.h',
         '<(skia_src_path)/core/SkPath.cpp',

tests.gyp

diff --git a/tests.gyp b/tests.gyp
index c67e578..8b3ceb8 100644
--- a/tests.gyp
+++ b/tests.gyp
@@ -22,6 +22,7 @@
       ],
       'sources': [
         '../tests/AAClipTest.cpp',
+        '../tests/AndroidPaintTest.cpp',
         '../tests/AnnotationTest.cpp',
         '../tests/ARGBImageEncoderTest.cpp',
         '../tests/AtomicTest.cpp',