ui/gfx: Add Android support for gfx_unittests target.

ui/gfx/gfx.gyp

Index: ui/gfx/gfx.gyp
diff --git a/ui/gfx/gfx.gyp b/ui/gfx/gfx.gyp
index 7e7d67aeb39e49386bef895cabdb962edaf9b95a..e150f7f9f28f61444ceb83f15ec2550c5b13d495 100644
--- a/ui/gfx/gfx.gyp
+++ b/ui/gfx/gfx.gyp
@@ -494,7 +494,7 @@
     },
     {
       'target_name': 'gfx_unittests',
-      'type': 'executable',
+      'type': '<(gtest_target_type)',
       'sources': [
         'geometry/box_unittest.cc',
         'geometry/cubic_bezier_unittest.cc',
@@ -539,5 +539,23 @@
        },
      ],
     }],
+    # Special target to wrap a gtest_target_type==shared_library
+    # gfx_unittests into an android apk for execution.
+    # See base.gyp for TODO(jrg)s about this strategy.
+    ['OS == "android" and gtest_target_type == "shared_library"', {
+      'targets': [
+        {
+          'target_name': 'gfx_unittests_apk',
+          'type': 'none',
+          'dependencies': [
+            'gfx_unittests',
+          ],
+          'variables': {
+            'test_suite_name': 'gfx_unittests',
+          },
+          'includes': [ '../../build/apk_test.gypi' ],
+        },
+      ],
+    }],
   ],
 }