prepare skia for shared library build on android

gyp/core.gyp

 # Core Skia library code.
 {
   'targets': [
     {
       'target_name': 'core',
       'product_name': 'skia_core',
       'type': 'static_library',
       'standalone_static_library': 1,
       'msvs_guid': 'B7760B5E-BFA8-486B-ACFD-49E3A6DE8E76',
 
@@ skipping 58 matching lines @@
               '$(SDKROOT)/System/Library/Frameworks/ImageIO.framework',
               '$(SDKROOT)/System/Library/Frameworks/MobileCoreServices.framework',
             ],
           },
         }],
         [ 'skia_os == "win"', {
           'include_dirs': [
             'config/win',
           ],
         }],
+        [ 'skia_os == "android"', {
+          'sources': [
+            '../src/core/SkPaintOptionsAndroid.cpp',
+          ],
+        }],
         [ 'skia_os == "android" and skia_arch_type == "arm" and armv7 == 1', {
           # The code in SkUtilsArm.cpp can be used on an ARM-based Linux system, not only Android.
           'sources': [
             '../src/core/SkPaintOptionsAndroid.cpp',
             '../src/core/SkUtilsArm.cpp',
             '../src/core/SkUtilsArm.h',
           ],
         }],
         ['skia_gpu == 1', {
           'include_dirs': [
@@ skipping 24 matching lines @@
               '../include/utils/ios',
             ],
           }],
           [ 'skia_os == "win"', {
             'include_dirs': [
               'config/win',
             ],
           }],
         ],
       },
-      'dependencies': [
-        'opts.gyp:opts'
-      ],
     },
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: