Android: cleanup gtest_target_type conditions.

ipc/ipc.gyp

 # Copyright (c) 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': {
     'chromium_code': 1,
   },
   'includes': [
     'ipc.gypi',
@@ skipping 49 matching lines @@
         'run_all_unittests.cc',
         'sync_socket_unittest.cc',
         'unix_domain_socket_util_unittest.cc',
       ],
       'conditions': [
         ['OS == "win" or OS == "ios"', {
           'sources!': [
             'unix_domain_socket_util_unittest.cc',
           ],
         }],
-        ['OS == "android" and gtest_target_type == "shared_library"', {
+        ['OS == "android"', {
           'dependencies': [
             '../testing/android/native_test.gyp:native_test_native_code',
           ],
         }],
         ['os_posix == 1 and OS != "mac" and OS != "android"', {
           'conditions': [
             ['use_allocator!="none"', {
               'dependencies': [
                 '../base/allocator/allocator.gyp:allocator',
               ],
@@ skipping 17 matching lines @@
       ],
       'include_dirs': [
         '..'
       ],
       'sources': [
         'ipc_perftests.cc',
         'ipc_test_base.cc',
         'ipc_test_base.h',
       ],
       'conditions': [
-        ['OS == "android" and gtest_target_type == "shared_library"', {
+        ['OS == "android"', {
           'dependencies': [
             '../testing/android/native_test.gyp:native_test_native_code',
           ],
         }],
         ['os_posix == 1 and OS != "mac" and OS != "android"', {
           'conditions': [
             ['use_allocator!="none"', {
               'dependencies': [
                 '../base/allocator/allocator.gyp:allocator',
               ],
@@ skipping 41 matching lines @@
             ],
           },
           'configurations': {
             'Common_Base': {
               'msvs_target_platform': 'x64',
             },
           },
         },
       ],
     }],
-    # Special target to wrap a gtest_target_type==shared_library
-    # ipc_tests 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': 'ipc_tests_apk',
           'type': 'none',
           'dependencies': [
             'ipc_tests',
           ],
           'variables': {
             'test_suite_name': 'ipc_tests',
           },
           'includes': [ '../build/apk_test.gypi' ],
         },
         {
           'target_name': 'ipc_perftests_apk',
           'type': 'none',
           'dependencies': [
             'ipc_perftests',
           ],
           'variables': {
             'test_suite_name': 'ipc_perftests',
           },
           'includes': [ '../build/apk_test.gypi' ],
         }],
     }],
   ],
 }