Android: cleanup gtest_target_type conditions.

gpu/gpu_common.gypi

 # 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,
     # These are defined here because we need to build this library twice. Once
     # with extra parameter checking. Once with no parameter checking to be 100%
     # OpenGL ES 2.0 compliant for the conformance tests.
@@ skipping 31 matching lines @@
       'command_buffer/client/program_info_manager.h',
       'command_buffer/client/query_tracker.cc',
       'command_buffer/client/query_tracker.h',
       'command_buffer/client/share_group.cc',
       'command_buffer/client/share_group.h',
       'command_buffer/client/vertex_array_object_manager.cc',
       'command_buffer/client/vertex_array_object_manager.h',
     ]
   },
   'conditions': [
-    # Special target to wrap a gtest_target_type==shared_library
-    # gpu_unittests into an android apk for execution.
-    ['OS == "android" and gtest_target_type == "shared_library"', {
+    ['OS == "android"', {
       'targets': [
         {
           'target_name': 'gpu_unittests_apk',
           'type': 'none',
           'dependencies': [
             'gpu_unittests',
           ],
           'variables': {
             'test_suite_name': 'gpu_unittests',
           },
           'includes': [ '../build/apk_test.gypi' ],
         },
       ],
     }],
   ],
 }