Android: cleanup gtest_target_type conditions.

build/all.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': {
     # A hook that can be overridden in other repositories to add additional
     # compilation targets to 'All'. Only used on Android.
     'android_app_targets%': [],
   },
@@ skipping 731 matching lines @@
             '../net/net.gyp:net_unittests',
             '../sandbox/sandbox.gyp:sandbox_linux_unittests_stripped',
             '../sql/sql.gyp:sql_unittests',
             '../sync/sync.gyp:sync_unit_tests',
             '../third_party/WebKit/public/all.gyp:*',
             '../tools/android/android_tools.gyp:android_tools',
             '../tools/android/android_tools.gyp:memconsumer',
             '../tools/android/findbugs_plugin/findbugs_plugin.gyp:findbugs_plugin_test',
             '../ui/events/events.gyp:events_unittests',
             '../ui/ui_unittests.gyp:ui_unittests',
-          ],
-          'conditions': [
-            ['"<(gtest_target_type)"=="shared_library"', {
-              'dependencies': [
-                # Unit test bundles packaged as an apk.
-                '../android_webview/android_webview.gyp:android_webview_unittests_apk',
-                '../base/base.gyp:base_unittests_apk',
-                '../cc/cc_tests.gyp:cc_unittests_apk',
-                '../chrome/chrome.gyp:unit_tests_apk',
-                '../components/components_tests.gyp:components_unittests_apk',
-                '../content/content_shell_and_tests.gyp:content_browsertests_apk',
-                '../content/content_shell_and_tests.gyp:content_gl_tests_apk',
-                '../content/content_shell_and_tests.gyp:content_unittests_apk',
-                '../content/content_shell_and_tests.gyp:video_decode_accelerator_unittest_apk',
-                '../gpu/gpu.gyp:gl_tests_apk',
-                '../gpu/gpu.gyp:gpu_unittests_apk',
-                '../ipc/ipc.gyp:ipc_tests_apk',
-                '../media/media.gyp:media_unittests_apk',
-                '../net/net.gyp:net_unittests_apk',
-                '../sandbox/sandbox.gyp:sandbox_linux_jni_unittests_apk',
-                '../sql/sql.gyp:sql_unittests_apk',
-                '../sync/sync.gyp:sync_unit_tests_apk',
-                '../ui/events/events.gyp:events_unittests_apk',
-                '../ui/gfx/gfx_tests.gyp:gfx_unittests_apk',
-                '../ui/ui_unittests.gyp:ui_unittests_apk',
-                '../android_webview/android_webview.gyp:android_webview_test_apk',
-                '../chrome/chrome.gyp:chrome_shell_test_apk',
-                '../chrome/chrome.gyp:chrome_shell_uiautomator_tests',
-                '../webkit/renderer/compositor_bindings/compositor_bindings_tests.gyp:webkit_compositor_bindings_unittests_apk'
-              ],
-            }],
+            # Unit test bundles packaged as an apk.
+            '../android_webview/android_webview.gyp:android_webview_unittests_apk',
+            '../base/base.gyp:base_unittests_apk',
+            '../cc/cc_tests.gyp:cc_unittests_apk',
+            '../chrome/chrome.gyp:unit_tests_apk',
+            '../components/components_tests.gyp:components_unittests_apk',
+            '../content/content_shell_and_tests.gyp:content_browsertests_apk',
+            '../content/content_shell_and_tests.gyp:content_gl_tests_apk',
+            '../content/content_shell_and_tests.gyp:content_unittests_apk',
+            '../content/content_shell_and_tests.gyp:video_decode_accelerator_unittest_apk',
+            '../gpu/gpu.gyp:gl_tests_apk',
+            '../gpu/gpu.gyp:gpu_unittests_apk',
+            '../ipc/ipc.gyp:ipc_tests_apk',
+            '../media/media.gyp:media_unittests_apk',
+            '../net/net.gyp:net_unittests_apk',
+            '../sandbox/sandbox.gyp:sandbox_linux_jni_unittests_apk',
+            '../sql/sql.gyp:sql_unittests_apk',
+            '../sync/sync.gyp:sync_unit_tests_apk',
+            '../ui/events/events.gyp:events_unittests_apk',
+            '../ui/gfx/gfx_tests.gyp:gfx_unittests_apk',
+            '../ui/ui_unittests.gyp:ui_unittests_apk',
+            '../android_webview/android_webview.gyp:android_webview_test_apk',

[tfarina, 2014/05/27 16:10:03]

nit: alphabetical order.

[bulach, 2014/05/27 16:14:37]

Done.

+            '../chrome/chrome.gyp:chrome_shell_test_apk',
+            '../chrome/chrome.gyp:chrome_shell_uiautomator_tests',
+            '../webkit/renderer/compositor_bindings/compositor_bindings_tests.gyp:webkit_compositor_bindings_unittests_apk'
           ],
         },
         {
           # WebRTC Android APK tests.
           'target_name': 'android_builder_webrtc',
           'type': 'none',
           'variables': {
             # Set default value for include_tests to '0'. It is normally only
             # used in WebRTC GYP files. It is set to '1' only when building
             # WebRTC for Android, inside a Chromium checkout.
             'include_tests%': 0,
           },
           'conditions': [
-            ['"<(gtest_target_type)"=="shared_library" and include_tests==1', {
+            ['include_tests==1', {
               'dependencies': [
                 '../third_party/webrtc/build/apk_tests.gyp:*',
               ],
             }],
           ],
         },  # target_name: android_builder_webrtc
         {
           # WebRTC Chromium tests to run on Android.
           'target_name': 'android_builder_chromium_webrtc',
           'type': 'none',
           'dependencies': [
             '../content/content_shell_and_tests.gyp:content_browsertests',
             '../tools/android/android_tools.gyp:android_tools',
             '../tools/android/android_tools.gyp:memconsumer',
-          ],
-          'conditions': [
-            ['"<(gtest_target_type)"=="shared_library"', {
-              'dependencies': [
-                # Unit test bundles packaged as an apk.
-                '../content/content_shell_and_tests.gyp:content_browsertests_apk',
-              ],
-            }],
+            # Unit test bundles packaged as an apk.
+            '../content/content_shell_and_tests.gyp:content_browsertests_apk',
           ],
         },  # target_name: android_builder_chromium_webrtc
       ], # targets
     }], # OS="android"
     ['OS=="mac"', {
       'targets': [
         {
           # Target to build everything plus the dmg.  We don't put the dmg
           # in the All target because developers really don't need it.
           'target_name': 'all_and_dmg',
@@ skipping 398 matching lines @@
             # http://crbug.com/157234
             #'../chrome/chrome.gyp:sync_integration_tests_run',
             '../chrome/chrome.gyp:unit_tests_run',
             '../net/net.gyp:net_unittests_run',
           ],
         }, # target_name: chromium_swarm_tests
       ],
     }],
   ], # conditions
 }