Android: cleanup gtest_target_type conditions.

sync/sync_tests.gypi

Index: sync/sync_tests.gypi
diff --git a/sync/sync_tests.gypi b/sync/sync_tests.gypi
index 94cd52d55bdc28c12e1c47616dbf88ca93d86f69..a6a135de87e4c5205bd1aee249111f6d128a87b0 100644
--- a/sync/sync_tests.gypi
+++ b/sync/sync_tests.gypi
@@ -438,7 +438,7 @@
           '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',
@@ -517,7 +517,7 @@
             '../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',
           ],
@@ -676,9 +676,7 @@
         },
       ],
     }],
-    # 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',