Android: cleanup gtest_target_type conditions.

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': 1,
     'cc_unit_tests_source_files': [
       'animation/animation_unittest.cc',
       'animation/keyframed_animation_curve_unittest.cc',
@@ skipping 245 matching lines @@
         'test/run_all_unittests.cc',
         'test/cc_test_suite.cc',
         '<@(cc_unit_tests_source_files)',
         '<@(cc_surfaces_unit_tests_source_files)',
       ],
       'include_dirs': [
         'test',
         '.',
       ],
       'conditions': [
-        ['OS == "android" and gtest_target_type == "shared_library"',
+        ['OS == "android"',
           {
             'dependencies': [
               '../testing/android/native_test.gyp:native_test_native_code',
             ],
           }
         ],
         [ 'os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"',
           {
             'conditions': [
               [ 'use_allocator!="none"',
@@ skipping 39 matching lines @@
         'test/run_all_perftests.cc',
         'trees/layer_tree_host_common_perftest.cc',
         'trees/layer_tree_host_perftest.cc',
         'trees/occlusion_tracker_perftest.cc',
       ],
       'include_dirs': [
         'test',
         '.',
       ],
       'conditions': [
-        ['OS == "android" and gtest_target_type == "shared_library"',
+        ['OS == "android"',
           {
             'dependencies': [
               '../testing/android/native_test.gyp:native_test_native_code',
             ],
           }
         ],
         # See http://crbug.com/162998#c4 for why this is needed.
         ['OS=="linux" and use_allocator!="none"',
           {
             'dependencies': [
@@ skipping 31 matching lines @@
         '../ui/gl/gl.gyp:gl',
       ],
       'sources': [
         '<@(cc_tests_support_files)',
       ],
       # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
       'msvs_disabled_warnings': [ 4267, ],
     },
   ],
   '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"',
+    ['OS == "android"',
       {
         'targets': [
           {
             'target_name': 'cc_unittests_apk',
             'type': 'none',
             'dependencies': [
               'cc_unittests',
             ],
             'variables': {
               'test_suite_name': 'cc_unittests',
             },
             'includes': [ '../build/apk_test.gypi' ],
           },
           {
             'target_name': 'cc_perftests_apk',
             'type': 'none',
             'dependencies': [
               'cc_perftests',
             ],
             'variables': {
               'test_suite_name': 'cc_perftests',
             },
             'includes': [ '../build/apk_test.gypi' ],
           },
         ],
       }
     ]
   ],
 }