Android: cleanup gtest_target_type conditions.

components/components_tests.gyp

 # Copyright 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': {
     # This turns on e.g. the filename-based detection of which
     # platforms to include source files on (e.g. files ending in
     # _mac.h or _mac.cc are only compiled on MacOSX).
     'chromium_code': 1,
@@ skipping 418 matching lines @@
               ],
               'dependencies!': [
                 'components.gyp:storage_monitor',
                 'components.gyp:storage_monitor_test_support',
                 'components.gyp:usb_service',
                 'components.gyp:web_modal',
                 'components.gyp:web_modal_test_support',
                 '../third_party/libusb/libusb.gyp:libusb',
               ],
             }],
-            ['OS == "android" and gtest_target_type == "shared_library"', {
+            ['OS == "android"', {
               'dependencies': [
                 '../testing/android/native_test.gyp:native_test_native_code',
               ]
             }],
             ['chromeos==1', {
               'sources!': [
                 'storage_monitor/storage_monitor_linux_unittest.cc',
               ],
               'dependencies': [
                 '../chromeos/chromeos.gyp:chromeos_test_support',
@@ skipping 122 matching lines @@
             '../testing/gtest.gyp:gtest',
             'components.gyp:visitedlink_browser',
           ],
          'include_dirs': [
            '..',
          ],
          'sources': [
            'visitedlink/test/visitedlink_perftest.cc',
          ],
          'conditions': [
-           ['OS == "android" and gtest_target_type == "shared_library"', {
+           ['OS == "android"', {
              'dependencies': [
                '../testing/android/native_test.gyp:native_test_native_code',
              ],
            }],
          ],
          # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
          'msvs_disabled_warnings': [ 4267, ],
         },
       ],
       'conditions': [
-        ['OS == "android" and gtest_target_type == "shared_library"', {
+        ['OS == "android"', {
           'targets': [
             {
               'target_name': 'components_unittests_apk',
               'type': 'none',
               'dependencies': [
                 'components_unittests',
               ],
               'variables': {
                 'test_suite_name': 'components_unittests',
               },
@@ skipping 102 matching lines @@
               'dependencies': [
                 '../base/allocator/allocator.gyp:allocator',
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }