Android: cleanup gtest_target_type conditions.

ui/ui_unittests.gyp

 # Copyright 2013 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,
   },
   'targets': [
     {
@@ skipping 117 matching lines @@
           },
           'link_settings': {
             'libraries': [
               '-limm32.lib',
               '-loleacc.lib',
             ],
           },
           # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
           'msvs_disabled_warnings': [ 4267, ],
         }],
-        ['OS == "android" and gtest_target_type == "shared_library"', {
+        ['OS == "android"', {
           'dependencies': [
             '../testing/android/native_test.gyp:native_test_native_code',
           ],
         }],
         ['use_pango == 1', {
           'dependencies': [
             '../build/linux/system.gyp:fontconfig',
             '../build/linux/system.gyp:pangocairo',
           ],
           'sources': [
@@ skipping 98 matching lines @@
         {
           'target_name': 'ui_unittests_bundle',
           'type': 'shared_library',
           'dependencies': [
             'resources/ui_resources.gyp:ui_test_pak',
           ],
           'includes': [ 'ui_unittests_bundle.gypi' ],
         },
       ],
     }],
-    # Special target to wrap a gtest_target_type==shared_library
-    # ui_unittests into an android apk for execution.
-    # See base.gyp for TODO(jrg)s about this strategy.
-    ['OS == "android" and gtest_target_type == "shared_library"', {
+    ['OS == "android"', {
       'targets': [
         {
           'target_name': 'ui_unittests_apk',
           'type': 'none',
           'dependencies': [
             'ui_unittests',
           ],
           'variables': {
             'test_suite_name': 'ui_unittests',
           },
           'includes': [ '../build/apk_test.gypi' ],
         },
       ],
     }],
   ],
 }