Revert "Check in executable for iOS test launcher"

> Check in executable for iOS test launcher > > This doesn't do anything yet, mostly adds supporting infrastructure. > > R=lliabraa@chromium.org, mark@chromium.org, sdefresne@chromium.org, lliabraa, mark, sdefresne > TBR=darin > BUG=426870 Breaks correctness of Android build: ninja: Entering directory `out-android/Debug' ninja: warning: multiple rules generate ../../build/android. builds involving this target will not be correct; continuing anyway ninja: warning: multiple rules generate gen/enums/base_java_application_state/org/chromium/base/ApplicationState.java. builds involving this target will not be correct; continuing anyway ninja: warning: multiple rules generate gen/jsr_305_javalib/compile.stamp. builds involving this target will not be correct; continuing anyway ninja: warning: multiple rules generate gen/jsr_305_javalib/jsr_305_javalib.jar. builds involving this target will not be correct; continuing anyway ninja: warning: multiple rules generate lib.java/jsr_305_javalib.jar. builds involving this target will not be correct; continuing anyway ninja: warning: multiple rules generate gen/jsr_305_javalib/lint.stamp. builds involving this target will not be correct; continuing anyway ninja: warning: multiple rules generate lib.java/jsr_305_javalib.jar.TOC. builds involving this target will not be correct; continuing anyway ninja: warning: multiple rules generate lib.java/jsr_305_javalib.dex.jar. builds involving this target will not be correct; continuing anyway ninja: warning: multiple rules generate lib.java/jsr_305_javalib.dex.jar.inputs. builds involving this target will not be correct; continuing anyway ninja: warning: multiple rules generate gen/enums/base_java_memory_pressure_level/org/chromium/base/MemoryPressureLevel.java. builds involving this target will not be correct; continuing anyway ninja: warning: multiple rules generate gen/base_java/compile.stamp. builds involving this target will not be correct; continuing anyway ninja: warning: multiple rules generate gen/base_java/base_java.jar. builds involving this target will not be correct; continuing anyway ninja: warning: multiple rules generate lib.java/base_java.jar. builds involving this target will not be correct; continuing anyway ninja: warning: multiple rules generate gen/base_java/lint.stamp. builds involving this target will not be correct; continuing anyway ninja: warning: multiple rules generate lib.java/base_java.jar.TOC. builds involving this target will not be correct; continuing anyway ninja: warning: multiple rules generate lib.java/base_java.dex.jar. builds involving this target will not be correct; continuing anyway ninja: warning: multiple rules generate lib.java/base_java.dex.jar.inputs. builds involving this target will not be correct; continuing anyway ninja: warning: multiple rules generate gen/base_java_unittest_support/compile.stamp. builds involving this target will not be correct; continuing anyway ninja: warning: multiple rules generate gen/base_java_unittest_support/base_java_unittest_support.jar. builds involving this target will not be correct; continuing anyway ninja: warning: multiple rules generate lib.java/base_java_unittest_support.jar. builds involving this target will not be correct; continuing anyway ninja: warning: multiple rules generate gen/base_java_unittest_support/lint.stamp. builds involving this target will not be correct; continuing anyway ninja: warning: multiple rules generate lib.java/base_java_unittest_support.jar.TOC. builds involving this target will not be correct; continuing anyway ninja: warning: multiple rules generate lib.java/base_java_unittest_support.dex.jar. builds involving this target will not be correct; continuing anyway ninja: warning: multiple rules generate lib.java/base_java_unittest_support.dex.jar.inputs. builds involving this target will not be correct; continuing anyway [2474 3248/20791] ACTION jni_generator_py_tests: run_jni_generator_py_tests_1f564c39dcae2772599d3e8883c02764 and adds host toolset dep for Java is unintended. R=phajdan.jr@chromium.org Review URL: https://codereview.chromium.org/678653004 Cr-Commit-Position: refs/heads/master@{#301147}
cbchan · Oct 24, 2014 · cb4d80c · cb4d80c
1 parent 6aa5013
commit cb4d80c
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 67 deletions.
diff --git a/base/base.gyp b/base/base.gyp
@@ -216,7 +216,7 @@
             ],
           },
         }],
-        ['OS != "win" and (OS != "ios" or _toolset == "host")', {
+        ['OS != "win" and OS != "ios"', {
             'dependencies': ['../third_party/libevent/libevent.gyp:libevent'],
         },],
         ['component=="shared_library"', {
@@ -265,7 +265,6 @@
     },
     {
       'target_name': 'base_i18n',
-      'toolsets': ['host', 'target'],
       'type': '<(component)',
       'variables': {
         'enable_wexit_time_destructors': 1,
@@ -856,7 +855,6 @@
     {
       # GN: //base/test:test_support
       'target_name': 'test_support_base',
-      'toolsets': ['host', 'target'],
       'type': 'static_library',
       'dependencies': [
         'base',
@@ -987,20 +985,11 @@
             # 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
     },
     {
@@ -1022,21 +1011,6 @@
     },
   ],
   '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': [
         {
@@ -1306,7 +1280,6 @@
         {
           # GN: //base:base_jni_headers
           'target_name': 'base_jni_headers',
-          'toolsets': ['host', 'target'],
           'type': 'none',
           'sources': [
             'android/java/src/org/chromium/base/ApplicationStatus.java',
@@ -1338,7 +1311,6 @@
         {
           # TODO(GN)
           'target_name': 'base_unittests_jni_headers',
-          'toolsets': ['host', 'target'],
           'type': 'none',
           'sources': [
             'test/android/java/src/org/chromium/base/ContentUriTestUtils.java',
@@ -1351,7 +1323,6 @@
         {
           # GN: //base:base_native_libraries_gen
           'target_name': 'base_native_libraries_gen',
-          'toolsets': ['host', 'target'],
           'type': 'none',
           'sources': [
             'android/java/templates/NativeLibraries.template',
@@ -1365,7 +1336,6 @@
         {
           # GN: //base:base_java
           'target_name': 'base_java',
-          'toolsets': ['host', 'target'],
           'type': 'none',
           'variables': {
             'java_in_dir': '../base/android/java',
@@ -1388,7 +1358,6 @@
         {
           # GN: //base:base_java_unittest_support
           'target_name': 'base_java_unittest_support',
-          'toolsets': ['host', 'target'],
           'type': 'none',
           'dependencies': [
             'base_java',
@@ -1401,7 +1370,6 @@
         {
           # 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',
@@ -1411,7 +1379,6 @@
         {
           # 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',

diff --git a/base/test/launcher/test_launcher_ios.cc b/base/test/launcher/test_launcher_ios.cc
diff --git a/build/android/android_exports.gyp b/build/android/android_exports.gyp
@@ -6,7 +6,6 @@
   'targets': [
     {
       'target_name': 'android_exports',
-      'toolsets': ['host', 'target'],
       'type': 'none',
       'inputs': [
         '<(DEPTH)/build/android/android_exports.lst',

diff --git a/build/android/setup.gyp b/build/android/setup.gyp
@@ -53,7 +53,6 @@
       # trying to create these directories.
       # The build/java.gypi target depends on this target.
       'target_name': 'build_output_dirs',
-      'toolsets': ['host', 'target'],
       'type': 'none',
       'actions': [
         {

diff --git a/testing/gmock.gyp b/testing/gmock.gyp
@@ -6,7 +6,6 @@
   'targets': [
     {
       'target_name': 'gmock',
-      'toolsets': ['host', 'target'],
       'type': 'static_library',
       'dependencies': [
         'gtest.gyp:gtest',

diff --git a/third_party/jsr-305/jsr-305.gyp b/third_party/jsr-305/jsr-305.gyp
@@ -6,7 +6,6 @@
   'targets': [
     {
       'target_name': 'jsr_305_javalib',
-      'toolsets': ['host', 'target'],
       'type': 'none',
       'variables': {
         # The sources are not located in a folder that is called src/, so we

diff --git a/third_party/libxml/libxml.gyp b/third_party/libxml/libxml.gyp
@@ -18,7 +18,6 @@
   'targets': [
     {
       'target_name': 'libxml',
-      'toolsets': ['host', 'target'],
       'conditions': [
         ['use_system_libxml', {
           'conditions': [
@@ -52,14 +51,7 @@
               },
             }],
             ['OS == "ios"', {
-              'type': 'static_library',
-              'sources': [
-                'chromium/libxml_utils.h',
-                'chromium/libxml_utils.cc',
-              ],
-              'include_dirs': [
-                '$(SDKROOT)/usr/include/libxml2',
-              ],
+              'type': 'none',
               'all_dependent_settings': {
                 'defines': [
                   'USE_SYSTEM_LIBXML',