Enable compositor tests on android.

cc/cc_tests.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 0,
     'use_libcc_for_compositor%': 0,
     'cc_tests_source_files': [
       'hash_pair_unittest.cc',
@@ skipping 88 matching lines @@
       'test/fake_web_compositor_software_output_device.h',
       'test/fake_web_graphics_context_3d.h',
       'test/fake_web_scrollbar_theme_geometry.h',
       'test/mock_quad_culler.h',
       'test/web_compositor_initializer.h',
     ],
   },
   'targets': [
     {
       'target_name': 'cc_unittests',
-      'type': 'executable',
+      'type': '<(gtest_target_type)',
       'dependencies': [
         '../base/base.gyp:test_support_base',
         '../testing/gtest.gyp:gtest',
         '../testing/gmock.gyp:gmock',
       ],
       'sources': [
         'test/run_all_unittests.cc',
       ],
       'conditions': [
         ['use_libcc_for_compositor==1', {
           'dependencies': [
             '../third_party/WebKit/Source/WTF/WTF.gyp/WTF.gyp:wtf',
             '../skia/skia.gyp:skia',
             'cc.gyp:cc',
             'cc_test_support',
           ],
           'defines': [
             'USE_LIBCC_FOR_COMPOSITOR',
           ],
           'include_dirs': [
             'stubs',
             'test',
             '.',
             '../third_party/WebKit/Source/Platform/chromium',
           ],
           'sources': [
             '<@(cc_tests_source_files)',
           ],
         }],
+        ['OS == "android" and gtest_target_type == "shared_library"', {
+          'dependencies': [
+            '../testing/android/native_test.gyp:native_test_native_code',
+          ],
+        }],
       ],
     },
   ],
   'conditions': [
+    # Special target to wrap a gtest_target_type==shared_library
+    # cc_unittests into an android apk for execution.
+    ['OS == "android" and gtest_target_type == "shared_library"', {
+      'targets': [
+        {
+          'target_name': 'cc_unittests_apk',
+          'type': 'none',
+          'dependencies': [
+            'cc_unittests',
+          ],
+          'variables': {
+            'test_suite_name': 'cc_unittests',
+            'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)cc_unittests<(SHARED_LIB_SUFFIX)',
+          },
+          'includes': [ '../build/apk_test.gypi' ],
+        },
+      ],
+    }],
     ['use_libcc_for_compositor==1', {
       'targets': [
         {
           'target_name': 'cc_test_support',
           'type': 'static_library',
           'include_dirs': [
             'stubs',
             'test',
             '.',
             '..',
@@ skipping 13 matching lines @@
           'sources': [
             '<@(cc_tests_support_files)',
             'test/test_webkit_platform.cc',
             'test/test_webkit_platform.h',
           ],
         },
       ],
     }],
   ],
 }