Android: cleanup gtest_target_type conditions.

ui/events/events.gyp

 # Copyright 2013 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,
   },
   'targets': [
     {
@@ skipping 303 matching lines @@
             '<(DEPTH)/base/allocator/allocator.gyp:allocator',
           ],
         }],
         # Exclude tests that rely on event_utils.h for platforms that do not
         # provide native cracking, i.e., platforms that use events_stub.cc.
         ['OS!="win" and use_x11!=1 and use_ozone!=1', {
           'sources!': [
             'event_unittest.cc',
           ],
         }],
-        ['OS == "android" and gtest_target_type == "shared_library"', {
+        ['OS == "android"', {
           'dependencies': [
             '../../testing/android/native_test.gyp:native_test_native_code',
           ],
         }],
       ],
     },
   ],
   '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',
           'type': 'none',
           'dependencies': [
             'events_unittests',
           ],
           'variables': {
             'test_suite_name': 'events_unittests',
           },
           'includes': [ '../../build/apk_test.gypi' ],
         },
       ],
     }],
   ],
 }