Android: cleanup gtest_target_type conditions.

chrome/chrome_tests_unit.gypi

 # 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.
 {
   'targets': [
     {
       # This target contains mocks and test utilities that don't belong in
       # production libraries but are used by more than one test executable.
       'target_name': 'test_support_common',
       'type': 'static_library',
@@ skipping 2583 matching lines @@
             ['exclude', '^browser/ui/webui/ntp/'],
             ['exclude', '^browser/ui/webui/options/'],
             ['exclude', '^browser/ui/webui/options/'],
             ['exclude', '^browser/ui/webui/signin/'],
             ['exclude', '^browser/ui/webui/suggestions_internals'],
             ['exclude', '^browser/ui/webui/sync_promo'],
             ['exclude', '^tools/profile_reset/'],
             ['exclude', '^utility/importer/'],
             ['exclude', '^utility/media_galleries/'],
           ],
-          'conditions': [
-            ['gtest_target_type == "shared_library"', {
-              'dependencies': [
-                '../testing/android/native_test.gyp:native_test_native_code',
-              ],
-            }],
+          'dependencies': [
+            '../testing/android/native_test.gyp:native_test_native_code',
           ],
         }],  # OS == android
         ['OS!="android" and OS!="ios" and chromeos==0 and configuration_policy==1', {
           'sources': [
             'browser/net/disk_cache_dir_policy_handler_unittest.cc',
           ],
         }],
         ['OS!="android" and OS!="ios" and configuration_policy==1', {
           'sources': [
             'browser/download/download_dir_policy_handler_unittest.cc'
@@ skipping 154 matching lines @@
             'VCLinkerTool': {
               'AdditionalDependencies': [ 'wintrust.lib' ],
             },
           },
         }],
       ],
     },
   ],
 
   'conditions': [
-    # Special target to wrap a gtest_target_type==shared_library
-    # unit_tests into an android apk for execution.
-    ['OS == "android" and gtest_target_type == "shared_library"', {
+    ['OS == "android"', {
       'targets': [
         {
           'target_name': 'unit_tests_java',
           'type': 'none',
           'variables': {
             'java_in_dir': 'test/android/unit_tests_apk',
           },
           'dependencies': [
             'chrome_java',
           ],
@@ skipping 47 matching lines @@
               # more details.
               'DebugInformationFormat': '3',
               'ProgramDataBaseFileName': '<(PRODUCT_DIR)/unit_tests.exe.pdb',
             },
           },
         },
       ],
     }],
   ],  # 'conditions'
 }