Revert "Check in executable for iOS test launcher"

base/base.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,
   },
   'includes': [
     '../build/win_precompile.gypi',
@@ skipping 198 matching lines @@
           'link_settings': {
             'libraries': [
               '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
               '$(SDKROOT)/System/Library/Frameworks/CoreGraphics.framework',
               '$(SDKROOT)/System/Library/Frameworks/CoreText.framework',
               '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
               '$(SDKROOT)/System/Library/Frameworks/UIKit.framework',
             ],
           },
         }],
-        ['OS != "win" and (OS != "ios" or _toolset == "host")', {
+        ['OS != "win" and OS != "ios"', {
             'dependencies': ['../third_party/libevent/libevent.gyp:libevent'],
         },],
         ['component=="shared_library"', {
           'conditions': [
             ['OS=="win"', {
               'sources!': [
                 'debug/debug_on_start_win.cc',
               ],
             }],
           ],
@@ skipping 28 matching lines @@
         'sync_socket.h',
         'sync_socket_win.cc',
         'sync_socket_posix.cc',
       ],
       'includes': [
         '../build/android/increase_size_for_speed.gypi',
       ],
     },
     {
       'target_name': 'base_i18n',
-      'toolsets': ['host', 'target'],
       'type': '<(component)',
       'variables': {
         'enable_wexit_time_destructors': 1,
         'optimize': 'max',
         'base_i18n_target': 1,
       },
       'dependencies': [
         'base',
         'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../third_party/icu/icu.gyp:icui18n',
@@ skipping 570 matching lines @@
         'base_i18n',
         'base',
       ],
       'sources': [
         'i18n/streaming_utf8_validator_perftest.cc',
       ],
     },
     {
       # GN: //base/test:test_support
       'target_name': 'test_support_base',
-      'toolsets': ['host', 'target'],
       'type': 'static_library',
       'dependencies': [
         'base',
         'base_static',
         'base_i18n',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/libxml/libxml.gyp:libxml',
         'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
       ],
@@ skipping 110 matching lines @@
         'test/values_test_util.cc',
         'test/values_test_util.h',
       ],
       'target_conditions': [
         ['OS == "ios"', {
           'sources/': [
             # Pull in specific Mac files for iOS (which have been filtered out
             # by file name rules).
             ['include', '^test/test_file_util_mac\\.cc$'],
           ],
-        }],
-        ['OS == "ios" and _toolset == "target"', {
           'sources!': [
             # iOS uses its own unit test launcher.
             'test/launcher/unit_test_launcher.cc',
           ],
         }],
-        ['OS == "ios" and _toolset == "host"', {
-          'sources!': [
-            'test/launcher/unit_test_launcher_ios.cc',
-            'test/test_support_ios.h',
-            'test/test_support_ios.mm',
-          ],
-        }],
       ],  # target_conditions
     },
     {
       'target_name': 'test_support_perf',
       'type': 'static_library',
       'dependencies': [
         'base',
         'test_support_base',
         '../testing/gtest.gyp:gtest',
       ],
       'sources': [
         'test/run_all_perftests.cc',
       ],
       'direct_dependent_settings': {
         'defines': [
           'PERF_TEST',
         ],
       },
     },
   ],
   'conditions': [
-    ['OS=="ios" and "<(GENERATOR)"=="ninja"', {
-      'targets': [
-        {
-          'target_name': 'test_launcher',
-          'toolsets': ['host'],
-          'type': 'executable',
-          'dependencies': [
-            'test_support_base',
-          ],
-          'sources': [
-            'test/launcher/test_launcher_ios.cc',
-          ],
-        },
-      ],
-    }],
     ['OS!="ios"', {
       'targets': [
         {
           'target_name': 'check_example',
           'type': 'executable',
           'sources': [
             'check_example.cc',
           ],
           'dependencies': [
             'base',
@@ skipping 249 matching lines @@
             '../build/android/increase_size_for_speed.gypi',
           ],
         },
       ],
     }],
     ['OS == "android"', {
       'targets': [
         {
           # GN: //base:base_jni_headers
           'target_name': 'base_jni_headers',
-          'toolsets': ['host', 'target'],
           'type': 'none',
           'sources': [
             'android/java/src/org/chromium/base/ApplicationStatus.java',
             'android/java/src/org/chromium/base/BuildInfo.java',
             'android/java/src/org/chromium/base/CommandLine.java',
             'android/java/src/org/chromium/base/ContentUriUtils.java',
             'android/java/src/org/chromium/base/CpuFeatures.java',
             'android/java/src/org/chromium/base/EventLog.java',
             'android/java/src/org/chromium/base/FieldTrialList.java',
             'android/java/src/org/chromium/base/ImportantFileWriterAndroid.java',
@@ skipping 11 matching lines @@
             'android/java/src/org/chromium/base/TraceEvent.java',
           ],
           'variables': {
             'jni_gen_package': 'base',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
         {
           # TODO(GN)
           'target_name': 'base_unittests_jni_headers',
-          'toolsets': ['host', 'target'],
           'type': 'none',
           'sources': [
             'test/android/java/src/org/chromium/base/ContentUriTestUtils.java',
           ],
           'variables': {
             'jni_gen_package': 'base',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
         {
           # GN: //base:base_native_libraries_gen
           'target_name': 'base_native_libraries_gen',
-          'toolsets': ['host', 'target'],
           'type': 'none',
           'sources': [
             'android/java/templates/NativeLibraries.template',
           ],
           'variables': {
             'package_name': 'org/chromium/base/library_loader',
             'template_deps': [],
           },
           'includes': [ '../build/android/java_cpp_template.gypi' ],
         },
         {
           # GN: //base:base_java
           'target_name': 'base_java',
-          'toolsets': ['host', 'target'],
           'type': 'none',
           'variables': {
             'java_in_dir': '../base/android/java',
             'jar_excluded_classes': [ '*/NativeLibraries.class' ],
           },
           'dependencies': [
             'base_java_application_state',
             'base_java_memory_pressure_level',
             'base_native_libraries_gen',
           ],
           'includes': [ '../build/java.gypi' ],
           'conditions': [
             ['android_webview_build==0', {
               'dependencies': [
                 '../third_party/jsr-305/jsr-305.gyp:jsr_305_javalib',
               ],
             }]
           ],
         },
         {
           # GN: //base:base_java_unittest_support
           'target_name': 'base_java_unittest_support',
-          'toolsets': ['host', 'target'],
           'type': 'none',
           'dependencies': [
             'base_java',
           ],
           'variables': {
             'java_in_dir': '../base/test/android/java',
           },
           'includes': [ '../build/java.gypi' ],
         },
         {
           # GN: //base:base_android_java_enums_srcjar
           'target_name': 'base_java_application_state',
-          'toolsets': ['host', 'target'],
           'type': 'none',
           'variables': {
             'source_file': 'android/application_status_listener.h',
           },
           'includes': [ '../build/android/java_cpp_enum.gypi' ],
         },
         {
           # GN: //base:base_android_java_enums_srcjar
           'target_name': 'base_java_memory_pressure_level',
-          'toolsets': ['host', 'target'],
           'type': 'none',
           'variables': {
             'source_file': 'memory/memory_pressure_listener.h',
           },
           'includes': [ '../build/android/java_cpp_enum.gypi' ],
         },
         {
           # GN: //base:base_java_test_support
           'target_name': 'base_java_test_support',
           'type': 'none',
@@ skipping 105 matching lines @@
               'dependencies': [
                 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }