Make gl_tests apk for android

gpu/gpu.gyp

Index: gpu/gpu.gyp
diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp
index 8255fd88dc8312237ccc431d5544744f14a820dd..1bb1105c0f8b845bda577d4bcb7664f669bb13cc 100644
--- a/gpu/gpu.gyp
+++ b/gpu/gpu.gyp
@@ -219,7 +219,7 @@
     },
     {
       'target_name': 'gl_tests',
-      'type': 'executable',
+      'type': '<(gtest_target_type)',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
@@ -264,6 +264,13 @@
         'command_buffer/tests/gl_stream_draw_unittests.cc',
         'command_buffer/tests/occlusion_query_unittests.cc',
       ],
+      'conditions': [
+        ['OS == "android" and gtest_target_type == "shared_library"', {
+          'dependencies': [
+            '../testing/android/native_test.gyp:native_test_native_code',
+          ],
+        }],
+      ],
       # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
       'msvs_disabled_warnings': [ 4267, ],
     },
@@ -481,5 +488,23 @@
         },
       ],
     }],
+    ['OS == "android" and gtest_target_type == "shared_library"', {
+      'targets': [
+        {
+          'target_name': 'gl_tests_apk',
+          'type': 'none',
+          'dependencies': [
+            'gl_tests',
+          ],
+          'variables': {
+            'test_suite_name': 'gl_tests',
+            'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)gl_tests<(SHARED_LIB_SUFFIX)',
+          },
+          'includes': [
+            '../build/apk_test.gypi',
+          ],
+        },
+      ],
+    }],
   ],
 }