Android: cleanup gtest_target_type conditions.

gpu/gpu.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': {
     'nacl_win64_target': 0,
   },
   'includes': [
     'gpu_common.gypi',
@@ skipping 263 matching lines @@
         'config/gpu_control_list_unittest.cc',
         'config/gpu_control_list_version_info_unittest.cc',
         'config/gpu_driver_bug_list_unittest.cc',
         'config/gpu_info_collector_unittest.cc',
         'config/gpu_info_unittest.cc',
         'config/gpu_test_config_unittest.cc',
         'config/gpu_test_expectations_parser_unittest.cc',
         'config/gpu_util_unittest.cc',
       ],
       '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': [
             '../base/allocator/allocator.gyp:allocator',
           ],
         }],
@@ skipping 48 matching lines @@
         'command_buffer/tests/gl_test_utils.h',
         'command_buffer/tests/gl_tests_main.cc',
         'command_buffer/tests/gl_texture_mailbox_unittest.cc',
         'command_buffer/tests/gl_texture_storage_unittest.cc',
         'command_buffer/tests/gl_unittest.cc',
         'command_buffer/tests/gl_unittests_android.cc',
         'command_buffer/tests/gl_virtual_contexts_unittest.cc',
         'command_buffer/tests/occlusion_query_unittest.cc',
       ],
       'conditions': [
-        ['OS == "android" and gtest_target_type == "shared_library"', {
+        ['OS == "android"', {
           'dependencies': [
             '../testing/android/native_test.gyp:native_test_native_code',
           ],
         }],
         ['OS == "win"', {
           'dependencies': [
             '../third_party/angle/src/build_angle.gyp:libEGL',
             '../third_party/angle/src/build_angle.gyp:libGLESv2',
           ],
         }],
@@ skipping 220 matching lines @@
             'GPU_IMPLEMENTATION',
           ],
           'configurations': {
             'Common_Base': {
               'msvs_target_platform': 'x64',
             },
           },
         },
       ],
     }],
-    ['OS == "android" and gtest_target_type == "shared_library"', {
+    ['OS == "android"', {
       'targets': [
         {
           'target_name': 'gl_tests_apk',
           'type': 'none',
           'dependencies': [
             'gl_tests',
           ],
           'variables': {
             'test_suite_name': 'gl_tests',
           },
           'includes': [
             '../build/apk_test.gypi',
           ],
         },
       ],
     }],
   ],
 }