Android: cleanup gtest_target_type conditions.

sync/sync_tests.gypi

 # 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.
 
 {
   'targets': [
     # Test support files for the 'sync_core' target.
     {
       'target_name': 'test_support_sync_core',
       'type': 'static_library',
@@ skipping 420 matching lines @@
           'internal_api/http_bridge_unittest.cc',
           'internal_api/js_mutation_event_observer_unittest.cc',
           'internal_api/js_sync_encryption_handler_observer_unittest.cc',
           'internal_api/js_sync_manager_observer_unittest.cc',
           'internal_api/protocol_event_buffer_unittest.cc',
           'internal_api/public/change_record_unittest.cc',
           'internal_api/public/sessions/sync_session_snapshot_unittest.cc',
           'internal_api/sync_backup_manager_unittest.cc',
           'internal_api/sync_core_proxy_impl_unittest.cc',
           'internal_api/sync_encryption_handler_impl_unittest.cc',
-          'internal_api/sync_manager_impl_unittest.cc',          
+          'internal_api/sync_manager_impl_unittest.cc',
           'internal_api/sync_rollback_manager_base_unittest.cc',
           'internal_api/sync_rollback_manager_unittest.cc',
           'internal_api/syncapi_server_connection_manager_unittest.cc',
         ],
         'conditions': [
           ['OS == "ios"', {
             'sources!': [
               'internal_api/http_bridge_unittest.cc',
             ],
           }],
@@ skipping 58 matching lines @@
       ],
       'conditions': [
         # TODO(akalin): This is needed because histogram.cc uses
         # leak_annotations.h, which pulls this in.  Make 'base'
         # propagate this dependency.
         ['OS=="linux" and use_allocator!="none"', {
           'dependencies': [
             '../base/allocator/allocator.gyp:allocator',
           ],
         }],
-        ['OS == "android" and gtest_target_type == "shared_library"', {
+        ['OS == "android"', {
           'dependencies': [
             '../testing/android/native_test.gyp:native_test_native_code',
           ],
         }],
       ],
     },
 
     # Test support files for using the Test Accounts service.
     {
       'target_name': 'test_support_accounts_client',
@@ skipping 138 matching lines @@
             'package_name': 'sync_java_test_support',
             'java_in_dir': '../sync/test/android/javatests',
           },
           'dependencies': [
             'sync_java',
           ],
           'includes': [ '../build/java.gypi' ],
         },
       ],
     }],
-    # Special target to wrap a gtest_target_type==shared_library
-    # sync_unit_tests into an android apk for execution.
-    ['OS == "android" and gtest_target_type == "shared_library"', {
+    ['OS == "android"', {
       'targets': [
         {
           'target_name': 'sync_unit_tests_apk',
           'type': 'none',
           'dependencies': [
             'sync_unit_tests',
           ],
           'variables': {
             'test_suite_name': 'sync_unit_tests',
           },
           'includes': [ '../build/apk_test.gypi' ],
         },
       ],
     }],
   ],
 }