Android: cleanup gtest_target_type conditions.

media/media.gyp

 # 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': {
     'chromium_code': 1,
     # Override to dynamically link the cras (ChromeOS audio) library.
     'use_cras%': 0,
     # Option e.g. for Linux distributions to link pulseaudio directly
@@ skipping 1131 matching lines @@
             'filters/ffmpeg_audio_decoder_unittest.cc',
             'filters/ffmpeg_demuxer_unittest.cc',
             'filters/ffmpeg_glue_unittest.cc',
             'filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc',
             'filters/ffmpeg_video_decoder_unittest.cc',
             'filters/in_memory_url_protocol_unittest.cc',
             'filters/opus_audio_decoder_unittest.cc',
             'filters/pipeline_integration_test.cc',
             'filters/pipeline_integration_test_base.cc',
           ],
-          'conditions': [
-            ['gtest_target_type=="shared_library"', {
-              'dependencies': [
-                '../testing/android/native_test.gyp:native_test_native_code',
-                'player_android',
-              ],
-            }],
+          'dependencies': [
+            '../testing/android/native_test.gyp:native_test_native_code',
+            'player_android',
           ],
         }],
         ['OS=="linux"', {
           'conditions': [
             ['use_cras==1', {
               'sources': [
                 'audio/cras/cras_input_unittest.cc',
                 'audio/cras/cras_unified_unittest.cc',
               ],
               'defines': [
@@ skipping 76 matching lines @@
         'filters/pipeline_integration_perftest.cc',
         'filters/pipeline_integration_test_base.cc',
       ],
       'conditions': [
         ['arm_neon==1', {
           'defines': [
             'USE_NEON'
           ],
         }],
         ['OS=="android"', {
-          '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',
+            ],
         }],
         ['media_use_ffmpeg==1', {
           'dependencies': [
             '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
           ],
         }, {  # media_use_ffmpeg==0
           'sources!': [
             'base/demuxer_perftest.cc',
             'filters/pipeline_integration_perftest.cc',
             'filters/pipeline_integration_test_base.cc',
@@ skipping 238 matching lines @@
         },
       ], # targets
     }],
     ['use_x11==1', {
       'targets': [
         {
           'target_name': 'player_x11',
           'type': 'executable',
           'dependencies': [
             'media',
-            'shared_memory_support',
+            'shared_memory_support',
             '../base/base.gyp:base',
             '../ui/gl/gl.gyp:gl',
             '../ui/gfx/gfx.gyp:gfx',
             '../ui/gfx/gfx.gyp:gfx_geometry',
             '../build/linux/system.gyp:x11',
             '../build/linux/system.gyp:xext',
             '../build/linux/system.gyp:xrender',
           ],
           'conditions': [
             # Linux/Solaris need libdl for dlopen() and friends.
@@ skipping 10 matching lines @@
             'tools/player_x11/data_source_logger.h',
             'tools/player_x11/gl_video_renderer.cc',
             'tools/player_x11/gl_video_renderer.h',
             'tools/player_x11/player_x11.cc',
             'tools/player_x11/x11_video_renderer.cc',
             'tools/player_x11/x11_video_renderer.h',
           ],
         },
       ],
     }],
-    # Special target to wrap a gtest_target_type==shared_library
-    # media_unittests into an android apk for execution.
-    ['OS=="android" and gtest_target_type=="shared_library"', {
+    ['OS=="android"', {
       'targets': [
         {
           'target_name': 'media_unittests_apk',
           'type': 'none',
           'dependencies': [
             'media_java',
             'media_unittests',
           ],
           'variables': {
             'test_suite_name': 'media_unittests',
@@ skipping 166 matching lines @@
                   ],
                 }],
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }