Android: cleanup gtest_target_type conditions.

sandbox/linux/sandbox_linux.gypi

 # 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': {
     'conditions': [
       ['OS=="linux"', {
         'compile_suid_client': 1,
         'compile_credentials': 1,
@@ skipping 87 matching lines @@
     },
     {
       # This target is the shared library used by Android APK (i.e.
       # JNI-friendly) tests.
       'target_name': 'sandbox_linux_jni_unittests',
       'includes': [
         'sandbox_linux_test_sources.gypi',
       ],
       'type': 'shared_library',
       'conditions': [
-        [ 'OS == "android" and gtest_target_type == "shared_library"', {
+        [ 'OS == "android"', {
           'dependencies': [
             '../testing/android/native_test.gyp:native_test_native_code',
           ],
         }],
       ],
     },
     {
       'target_name': 'seccomp_bpf',
       'type': '<(component)',
       'sources': [
@@ skipping 193 matching lines @@
         'dependencies': [ 'sandbox_linux_unittests' ],
         'actions': [{
           'action_name': 'strip sandbox_linux_unittests',
           'inputs': [ '<(PRODUCT_DIR)/sandbox_linux_unittests' ],
           'outputs': [ '<(PRODUCT_DIR)/sandbox_linux_unittests_stripped' ],
           'action': [ '<(android_strip)', '<@(_inputs)', '-o', '<@(_outputs)' ],
           }],
         }
       ],
     }],
-    # 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',
         'type': 'none',
         'variables': {
           'test_suite_name': 'sandbox_linux_jni_unittests',
         },
         'dependencies': [
           'sandbox_linux_jni_unittests',
         ],
         'includes': [ '../../build/apk_test.gypi' ],
         }
       ],
     }],
   ],
 }