Android: cleanup gtest_target_type conditions.

ui/gfx/gfx.gyp

 # Copyright (c) 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 531 matching lines @@
            '../android/java/src/org/chromium/ui/gfx/ViewConfigurationHelper.java',
          ],
          'variables': {
            'jni_gen_package': 'ui/gfx',
            'jni_generator_ptr_type': 'long'
          },
          'includes': [ '../../build/jni_generator.gypi' ],
        },
      ],
     }],
-    # 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',
           'type': 'none',
           'dependencies': [
             'gfx_unittests',
           ],
           'variables': {
             'test_suite_name': 'gfx_unittests',
           },
           'includes': [ '../../build/apk_test.gypi' ],
         },
       ],
     }],
   ],
 }