Android: cleanup gtest_target_type conditions.

webkit/renderer/compositor_bindings/compositor_bindings_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,
     'webkit_compositor_bindings_tests_sources': [
       'web_animation_unittest.cc',
       'web_float_animation_curve_unittest.cc',
@@ skipping 14 matching lines @@
         'compositor_bindings.gyp:webkit_compositor_bindings',
       ],
       'sources': [
         '<@(webkit_compositor_bindings_tests_sources)',
         'test/run_all_unittests.cc',
       ],
       'include_dirs': [
         '<(DEPTH)'
       ],
       'conditions': [
-        ['OS == "android" and gtest_target_type == "shared_library"', {
+        ['OS == "android"', {
           'dependencies': [
             '<(DEPTH)/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"', {
               'dependencies': [
                 '<(DEPTH)/base/allocator/allocator.gyp:allocator',
               ],
             }],
           ],
         }],
       ],
     },
   ],
   'conditions': [
-    # Special target to wrap a gtest_target_type==shared_library
-    # package webkit_compositor_bindings_unittests into an android apk for execution.
-    ['OS == "android" and gtest_target_type == "shared_library"', {
+    ['OS == "android"', {
       'targets': [
         {
           'target_name': 'webkit_compositor_bindings_unittests_apk',
           'type': 'none',
           'dependencies': [
             'webkit_compositor_bindings_unittests',
           ],
           'variables': {
             'test_suite_name': 'webkit_compositor_bindings_unittests',
           },
           'includes': [ '../../../build/apk_test.gypi' ],
         },
       ],
     }],
   ],
 }