Android: cleanup gtest_target_type conditions.

For a long time (crrev.com/133053) OS==android implies:
gtest_target_type=shared_library
Cleanup the spurious conditions and obsolete TODOs.

BUG=

Review URL: https://codereview.chromium.org/278443003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271222 0039d316-1c4b-4281-b951-d872f2087c98

18 files changed, 44 insertions, 92 deletions

diff --git a/base/base.gyp b/base/base.gyp
index a60d710..b0d27be 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -663,13 +663,7 @@
         ['OS == "android"', {
           'dependencies': [
             'android/jni_generator/jni_generator.gyp:jni_generator_tests',
-          ],
-          'conditions': [
-            ['gtest_target_type == "shared_library"', {
-              'dependencies': [
-                '../testing/android/native_test.gyp:native_test_native_code',
-              ],
-            }],
+            '../testing/android/native_test.gyp:native_test_native_code',
           ],
         }],
         ['OS == "ios" and _toolset != "host"', {
@@ -805,7 +799,7 @@
         '../testing/perf/perf_test.cc'
       ],
       'conditions': [
-        ['OS == "android" and gtest_target_type == "shared_library"', {
+        ['OS == "android"', {
           'dependencies': [
             '../testing/android/native_test.gyp:native_test_native_code',
           ],
@@ -1430,7 +1424,7 @@
 
       ],
     }],
-    ['OS == "android" and gtest_target_type == "shared_library"', {
+    ['OS == "android"', {
       'targets': [
         {
           'target_name': 'base_perftests_apk',
@@ -1461,13 +1455,7 @@
         },
       ],
     }],
-    # Special target to wrap a gtest_target_type == shared_library
-    # base_unittests into an android apk for execution.
-    # TODO(jrg): lib.target comes from _InstallableTargetInstallPath()
-    # in the gyp make generator.  What is the correct way to extract
-    # this path from gyp and into 'raw' for input to antfiles?
-    # Hard-coding in the gypfile seems a poor choice.
-    ['OS == "android" and gtest_target_type == "shared_library"', {
+    ['OS == "android"', {
       'targets': [
         {
           'target_name': 'base_unittests_apk',
diff --git a/build/apk_test.gypi b/build/apk_test.gypi
index 0cb22b8..95cce37 100644
--- a/build/apk_test.gypi
+++ b/build/apk_test.gypi
@@ -23,7 +23,7 @@
     '<(DEPTH)/tools/android/android_tools.gyp:android_tools',
   ],
   'conditions': [
-     ['OS == "android" and gtest_target_type == "shared_library"', {
+     ['OS == "android"', {
        'variables': {
          # These are used to configure java_apk.gypi included below.
          'apk_name': '<(test_suite_name)',
@@ -35,6 +35,6 @@
          'gyp_managed_install': 0,
        },
        'includes': [ 'java_apk.gypi' ],
-     }],  # 'OS == "android" and gtest_target_type == "shared_library"
+     }],  # 'OS == "android"
   ],  # conditions
 }
diff --git a/cc/cc_tests.gyp b/cc/cc_tests.gyp
index 218a140..f02d8cb 100644
--- a/cc/cc_tests.gyp
+++ b/cc/cc_tests.gyp
@@ -263,7 +263,7 @@
         '.',
       ],
       'conditions': [
-        ['OS == "android" and gtest_target_type == "shared_library"',
+        ['OS == "android"',
           {
             'dependencies': [
               '../testing/android/native_test.gyp:native_test_native_code',
@@ -323,7 +323,7 @@
         '.',
       ],
       'conditions': [
-        ['OS == "android" and gtest_target_type == "shared_library"',
+        ['OS == "android"',
           {
             'dependencies': [
               '../testing/android/native_test.gyp:native_test_native_code',
@@ -375,9 +375,7 @@
     },
   ],
   'conditions': [
-    # Special target to wrap a gtest_target_type==shared_library
-    # cc_unittests into an android apk for execution.
-    ['OS == "android" and gtest_target_type == "shared_library"',
+    ['OS == "android"',
       {
         'targets': [
           {
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index db00b20..d579e7643 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -2600,12 +2600,8 @@
             ['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', {
@@ -2780,9 +2776,7 @@
   ],
 
   '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',
diff --git a/components/components_tests.gyp b/components/components_tests.gyp
index 987c7e5..d1a6812 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -437,7 +437,7 @@
                 '../third_party/libusb/libusb.gyp:libusb',
               ],
             }],
-            ['OS == "android" and gtest_target_type == "shared_library"', {
+            ['OS == "android"', {
               'dependencies': [
                 '../testing/android/native_test.gyp:native_test_native_code',
               ]
@@ -580,7 +580,7 @@
            'visitedlink/test/visitedlink_perftest.cc',
          ],
          'conditions': [
-           ['OS == "android" and gtest_target_type == "shared_library"', {
+           ['OS == "android"', {
              'dependencies': [
                '../testing/android/native_test.gyp:native_test_native_code',
              ],
@@ -591,7 +591,7 @@
         },
       ],
       'conditions': [
-        ['OS == "android" and gtest_target_type == "shared_library"', {
+        ['OS == "android"', {
           'targets': [
             {
               'target_name': 'components_unittests_apk',
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 2f0c4e1..6e6ce3e 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -880,7 +880,7 @@
             '../third_party/libvpx/libvpx.gyp:libvpx',
           ],
         }],
-        ['OS == "android" and gtest_target_type == "shared_library"', {
+        ['OS == "android"', {
           'dependencies': [
             '../testing/android/native_test.gyp:native_test_native_code',
           ],
@@ -954,7 +954,7 @@
             'test/run_all_perftests.cc',
           ],
           'conditions': [
-            ['OS == "android" and gtest_target_type == "shared_library"', {
+            ['OS == "android"', {
               'dependencies': [
                 '../testing/android/native_test.gyp:native_test_native_code',
               ],
@@ -1283,7 +1283,7 @@
               'sources!': [
                 # These tests depend on single process mode, which is disabled
                 # in official builds.
-		'renderer/browser_render_view_browsertest.cc',
+    'renderer/browser_render_view_browsertest.cc',
                 'renderer/dom_serializer_browsertest.cc',
                 'renderer/resource_fetcher_browsertest.cc',
                 'renderer/savable_resources_browsertest.cc',
@@ -1492,10 +1492,7 @@
         },
       ]
     }],
-    # Special target to wrap a gtest_target_type==shared_library
-    # content_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': 'content_gl_tests_apk',
diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp
index b0ccb99..9d52a33 100644
--- a/gpu/gpu.gyp
+++ b/gpu/gpu.gyp
@@ -281,7 +281,7 @@
         'config/gpu_util_unittest.cc',
       ],
       'conditions': [
-        ['OS == "android" and gtest_target_type == "shared_library"', {
+        ['OS == "android"', {
           'dependencies': [
             '../testing/android/native_test.gyp:native_test_native_code',
           ],
@@ -350,7 +350,7 @@
         'command_buffer/tests/occlusion_query_unittest.cc',
       ],
       'conditions': [
-        ['OS == "android" and gtest_target_type == "shared_library"', {
+        ['OS == "android"', {
           'dependencies': [
             '../testing/android/native_test.gyp:native_test_native_code',
           ],
@@ -591,7 +591,7 @@
         },
       ],
     }],
-    ['OS == "android" and gtest_target_type == "shared_library"', {
+    ['OS == "android"', {
       'targets': [
         {
           'target_name': 'gl_tests_apk',
diff --git a/gpu/gpu_common.gypi b/gpu/gpu_common.gypi
index 4550fc7..e5027b5 100644
--- a/gpu/gpu_common.gypi
+++ b/gpu/gpu_common.gypi
@@ -49,9 +49,7 @@
     ]
   },
   'conditions': [
-    # Special target to wrap a gtest_target_type==shared_library
-    # gpu_unittests into an android apk for execution.
-    ['OS == "android" and gtest_target_type == "shared_library"', {
+    ['OS == "android"', {
       'targets': [
         {
           'target_name': 'gpu_unittests_apk',
diff --git a/ipc/ipc.gyp b/ipc/ipc.gyp
index c5a8c0b..a6e9269 100644
--- a/ipc/ipc.gyp
+++ b/ipc/ipc.gyp
@@ -67,7 +67,7 @@
             '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',
           ],
@@ -105,7 +105,7 @@
         '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',
           ],
@@ -167,10 +167,7 @@
         },
       ],
     }],
-    # 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',
diff --git a/net/net.gyp b/net/net.gyp
index 9a0c223..5b5db96 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -799,7 +799,7 @@
             ],
           },
         ],
-        ['OS == "android" and gtest_target_type == "shared_library"', {
+        ['OS == "android"', {
           # TODO(mmenke):  This depends on test_support_base, which depends on
           #                icu.  Figure out a way to remove that dependency.
           'dependencies': [
@@ -1627,10 +1627,7 @@
         },
       ],
     }],
-    # Special target to wrap a gtest_target_type==shared_library
-    # net_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': 'net_unittests_apk',
diff --git a/sandbox/linux/sandbox_linux.gypi b/sandbox/linux/sandbox_linux.gypi
index 0fdb6ba..16fd2c2 100644
--- a/sandbox/linux/sandbox_linux.gypi
+++ b/sandbox/linux/sandbox_linux.gypi
@@ -105,7 +105,7 @@
       ],
       'type': 'shared_library',
       'conditions': [
-        [ 'OS == "android" and gtest_target_type == "shared_library"', {
+        [ 'OS == "android"', {
           'dependencies': [
             '../testing/android/native_test.gyp:native_test_native_code',
           ],
@@ -319,8 +319,7 @@
         }
       ],
     }],
-    # Strategy copied from base_unittests_apk in base/base.gyp.
-    [ 'OS=="android" and gtest_target_type == "shared_library"', {
+    [ 'OS=="android"', {
       'targets': [
         {
         'target_name': 'sandbox_linux_jni_unittests_apk',
diff --git a/sql/sql.gyp b/sql/sql.gyp
index 6245940..37c6ae7 100644
--- a/sql/sql.gyp
+++ b/sql/sql.gyp
@@ -106,7 +106,7 @@
             }],
           ],
         }],
-        ['OS == "android" and gtest_target_type == "shared_library"', {
+        ['OS == "android"', {
           'dependencies': [
             '../testing/android/native_test.gyp:native_test_native_code',
           ],
@@ -117,9 +117,7 @@
     },
   ],
   'conditions': [
-    # Special target to wrap a gtest_target_type==shared_library
-    # sql_unittests into an android apk for execution.
-    ['OS == "android" and gtest_target_type == "shared_library"', {
+    ['OS == "android"', {
       'targets': [
         {
           'target_name': 'sql_unittests_apk',
diff --git a/sync/sync_tests.gypi b/sync/sync_tests.gypi
index b7acb42d..af63ad9 100644
--- a/sync/sync_tests.gypi
+++ b/sync/sync_tests.gypi
@@ -439,7 +439,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',
@@ -518,7 +518,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',
           ],
@@ -677,9 +677,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',
diff --git a/third_party/leveldatabase/leveldatabase.gyp b/third_party/leveldatabase/leveldatabase.gyp
index 58504f3..3ba3829 100644
--- a/third_party/leveldatabase/leveldatabase.gyp
+++ b/third_party/leveldatabase/leveldatabase.gyp
@@ -14,8 +14,7 @@
         'use_snappy': 0,
       },
     }],
-    ['OS=="android" and gtest_target_type == "shared_library"', {
-      # Wrap env_chromium_unittests into an android apk for execution.
+    ['OS=="android"', {
       'targets': [{
         'target_name': 'env_chromium_unittests_apk',
         'type': 'none',
@@ -196,7 +195,7 @@
         'env_chromium_unittest.cc',
       ],
       'conditions': [
-        ['OS=="android" and gtest_target_type == "shared_library"', {
+        ['OS=="android"', {
           'type': 'shared_library',
           'dependencies': [
             '../../testing/android/native_test.gyp:native_test_native_code',
diff --git a/ui/events/events.gyp b/ui/events/events.gyp
index 8383356..f3beac5 100644
--- a/ui/events/events.gyp
+++ b/ui/events/events.gyp
@@ -321,7 +321,7 @@
             'event_unittest.cc',
           ],
         }],
-        ['OS == "android" and gtest_target_type == "shared_library"', {
+        ['OS == "android"', {
           'dependencies': [
             '../../testing/android/native_test.gyp:native_test_native_code',
           ],
@@ -330,10 +330,7 @@
     },
   ],
   'conditions': [
-    # 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': 'events_unittests_apk',
diff --git a/ui/gfx/gfx.gyp b/ui/gfx/gfx.gyp
index 9f909f9..2e45f8b 100644
--- a/ui/gfx/gfx.gyp
+++ b/ui/gfx/gfx.gyp
@@ -548,10 +548,7 @@
        },
      ],
     }],
-    # Special target to wrap a gtest_target_type==shared_library
-    # gfx_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': 'gfx_unittests_apk',
diff --git a/ui/ui_unittests.gyp b/ui/ui_unittests.gyp
index f2ea062..28e76ae 100644
--- a/ui/ui_unittests.gyp
+++ b/ui/ui_unittests.gyp
@@ -135,7 +135,7 @@
           # 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',
           ],
@@ -254,10 +254,7 @@
         },
       ],
     }],
-    # 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',
diff --git a/webkit/renderer/compositor_bindings/compositor_bindings_tests.gyp b/webkit/renderer/compositor_bindings/compositor_bindings_tests.gyp
index f29a985..2444864 100644
--- a/webkit/renderer/compositor_bindings/compositor_bindings_tests.gyp
+++ b/webkit/renderer/compositor_bindings/compositor_bindings_tests.gyp
@@ -32,7 +32,7 @@
         '<(DEPTH)'
       ],
       'conditions': [
-        ['OS == "android" and gtest_target_type == "shared_library"', {
+        ['OS == "android"', {
           'dependencies': [
             '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code',
           ],
@@ -50,9 +50,7 @@
     },
   ],
   'conditions': [
-    # Special target to wrap a gtest_target_type==shared_library
-    # package webkit_compositor_bindings_unittests into an android apk for execution.
-    ['OS == "android" and gtest_target_type == "shared_library"', {
+    ['OS == "android"', {
       'targets': [
         {
           'target_name': 'webkit_compositor_bindings_unittests_apk',