Android: cleanup gtest_target_type conditions.

base/base.gyp

Index: base/base.gyp
diff --git a/base/base.gyp b/base/base.gyp
index c56fb88b125f13a042bcb512b08ce730bdf0856d..945ef9d67a014479e27e44f8c85d2032222c4e63 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',
           ],
@@ -1432,7 +1426,7 @@
 
       ],
     }],
-    ['OS == "android" and gtest_target_type == "shared_library"', {
+    ['OS == "android"', {
       'targets': [
         {
           'target_name': 'base_perftests_apk',
@@ -1463,13 +1457,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',