Update from chromium https://crrev.com/302282

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"', {
+        ['OS != "win" and (OS != "ios" or _toolset == "host")', {
             'dependencies': ['../third_party/libevent/libevent.gyp:libevent'],
         },],
         ['component=="shared_library"', {
           'conditions': [
             ['OS=="win"', {
               'sources!': [
                 'debug/debug_on_start_win.cc',
               ],
             }],
           ],
@@ skipping 58 matching lines @@
           'defines': ['ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE'],
         }, { # else icu_use_data_file_flag !=1
           'conditions': [
             ['OS=="win"', {
               'defines': ['ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_SHARED'],
             }, {
               'defines': ['ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC'],
             }],
           ],
         }],
+        ['OS == "ios"', {
+          'toolsets': ['host', 'target'],
+        }],
       ],
       'export_dependent_settings': [
         'base',
       ],
       'includes': [
         '../build/android/increase_size_for_speed.gypi',
       ],
     },
     {
       'target_name': 'base_message_loop_tests',
@@ skipping 572 matching lines @@
           'sources!': [
             'test/test_file_util_linux.cc',
           ],
         }],
         ['OS == "android"', {
           'dependencies': [
             'base_unittests_jni_headers',
             'base_java_unittest_support',
           ],
         }],
+        ['OS == "ios"', {
+          'toolsets': ['host', 'target'],
+        }],
       ],
       'sources': [
         'test/expectations/expectation.cc',
         'test/expectations/expectation.h',
         'test/expectations/parser.cc',
         'test/expectations/parser.h',
         'test/gtest_xml_util.cc',
         'test/gtest_xml_util.h',
         'test/launcher/test_launcher.cc',
         'test/launcher/test_launcher.h',
@@ skipping 79 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 349 matching lines @@
           'target_name': 'base_java_application_state',
           '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_library_load_from_apk_status_codes',
-          'toolsets': ['host', 'target'],
           'type': 'none',
           'variables': {
             'source_file': 'android/library_loader/library_load_from_apk_status_codes.h'
           },
           'includes': [ '../build/android/java_cpp_enum.gypi' ],
         },
         {
           # GN: //base:base_android_java_enums_srcjar
           'target_name': 'base_java_memory_pressure_level',
           'type': 'none',
@@ skipping 114 matching lines @@
               'dependencies': [
                 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }