Correct gyp toolsets for all combinations of want_separate_host_toolset and use_system_icu.

icu.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.
 
 {
   'includes': [
     'icu.gypi',
   ],
   'variables': {
     'use_system_icu%': 0,
@@ skipping 51 matching lines @@
           'sources': [
              # These are hand-generated, but will do for now.  The linux
              # version is an identical copy of the (mac) icudt46l_dat.S file,
              # modulo removal of the .private_extern and .const directives and
              # with no leading underscore on the icudt46_dat symbol.
              'android/icudt46l_dat.S',
              'linux/icudt46l_dat.S',
              'mac/icudt46l_dat.S',
           ],
           'conditions': [
-            [ 'use_system_icu==1', {
+            [ 'use_system_icu==1 and want_separate_host_toolset==1', {
               'toolsets': ['host'],
-            }, {
+            }],
+            [ 'use_system_icu==0 and want_separate_host_toolset==1', {
               'toolsets': ['host', 'target'],
             }],
+            [ 'use_system_icu==0 and want_separate_host_toolset==0', {
+              'toolsets': ['target'],
+            }],
             [ 'OS == "win" and icu_use_data_file_flag==0', {
               'type': 'none',
               'copies': [
                 {
                   'destination': '<(PRODUCT_DIR)',
                   'files': [
                     'windows/icudt.dll',
                   ],
                 },
               ],
@@ skipping 28 matching lines @@
               '(OS == "android" and (_toolset == "target" or host_os != "linux"))', {
               'sources!': ['linux/icudt46l_dat.S'],
             }],
             [ 'OS != "android" or _toolset == "host"', {
               'sources!': ['android/icudt46l_dat.S'],
             }],
             [ 'OS != "mac" and OS != "ios" and '
               '(OS != "android" or _toolset != "host" or host_os != "mac")', {
               'sources!': ['mac/icudt46l_dat.S'],
             }],
-          ],
+          ], # target_conditions
         },
         {
           'target_name': 'icui18n',
           'type': '<(component)',
           'sources': [
             '<@(icui18n_sources)',
           ],
           'defines': [
             'U_I18N_IMPLEMENTATION',
           ],
           'dependencies': [
             'icuuc',
           ],
           'direct_dependent_settings': {
             'include_dirs': [
               'source/i18n',
             ],
           },
           'conditions': [
-            [ 'use_system_icu==1', {
+            [ 'use_system_icu==1 and want_separate_host_toolset==1', {
               'toolsets': ['host'],
-            }, {
+            }],
+            [ 'use_system_icu==0 and want_separate_host_toolset==1', {
               'toolsets': ['host', 'target'],
             }],
+            [ 'use_system_icu==0 and want_separate_host_toolset==0', {
+              'toolsets': ['target'],
+            }],
             [ 'os_posix == 1 and OS != "mac" and OS != "ios"', {
               # Since ICU wants to internally use its own deprecated APIs, don't
               # complain about it.
               'cflags': [
                 '-Wno-deprecated-declarations',
               ],
               'cflags_cc': [
                 '-frtti',
               ],
             }],
@@ skipping 51 matching lines @@
                     '<(android_src)/abi/cpp/include',
                   ],
                   'link_settings': {
                     'libraries': [
                       '-lgabi++',
                     ],
                   },
                 }],
               ],
             }],
-          ],
+          ], # conditions
         },
         {
           'target_name': 'icuuc',
           'type': '<(component)',
           'sources': [
             '<@(icuuc_sources)',
           ],
           'defines': [
             'U_COMMON_IMPLEMENTATION',
           ],
           'dependencies': [
             'icudata',
           ],
           'direct_dependent_settings': {
             'include_dirs': [
               'source/common',
             ],
             'conditions': [
               [ 'component=="static_library"', {
                 'defines': [
                   'U_STATIC_IMPLEMENTATION',
                 ],
               }],
             ],
           },
           'conditions': [
-            [ 'use_system_icu==1', {
+            [ 'use_system_icu==1 and want_separate_host_toolset==1', {
               'toolsets': ['host'],
-            }, {
+            }],
+            [ 'use_system_icu==0 and want_separate_host_toolset==1', {
               'toolsets': ['host', 'target'],
             }],
+            [ 'use_system_icu==0 and want_separate_host_toolset==0', {
+              'toolsets': ['target'],
+            }],
             [ 'OS == "win"', {
               'sources': [
                 'source/stubdata/stubdata.c',
               ],
             }],
             [ 'os_posix == 1 and OS != "mac" and OS != "ios"', {
               'cflags': [
                 # Since ICU wants to internally use its own deprecated APIs,
                 # don't complain about it.
                 '-Wno-deprecated-declarations',
@@ skipping 48 matching lines @@
                   '-Wno-switch',
                 ],
               },
               'cflags': [
                 '-Wno-deprecated-declarations',
                 '-Wno-logical-op-parentheses',
                 '-Wno-tautological-compare',
                 '-Wno-switch',
               ],
             }],
-          ],
+          ], # conditions
         },
-      ],
+      ], # targets
     }],
     ['use_system_icu==1', {
       'targets': [
         {
           'target_name': 'system_icu',
           'type': 'none',
           'conditions': [
-            ['want_separate_host_toolset==1', {
-              'toolsets': ['target'],
-            }, {
-              'toolsets': ['host', 'target'],
-            }],
             ['OS=="android"', {
               'direct_dependent_settings': {
                 'include_dirs': [
                   '<(android_src)/external/icu4c/common',
                   '<(android_src)/external/icu4c/i18n',
                 ],
               },
               'link_settings': {
                 'libraries': [
                   '-licui18n',
@@ skipping 10 matching lines @@
                 ],
               },
             }],
           ],
         },
         {
           'target_name': 'icudata',
           'type': 'none',
           'dependencies': ['system_icu'],
           'export_dependent_settings': ['system_icu'],
-          'conditions': [
-            ['want_separate_host_toolset==1', {
-              'toolsets': ['target'],
-            }, {
-              'toolsets': ['host', 'target'],
-            }],
-          ],
+          'toolsets': ['target'],
         },
         {
           'target_name': 'icui18n',
           'type': 'none',
           'dependencies': ['system_icu'],
           'export_dependent_settings': ['system_icu'],
           'variables': {
             'headers_root_path': 'source/i18n',
             'header_filenames': [
               # This list can easily be updated using the command below:
@@ skipping 66 matching lines @@
               'unicode/usearch.h',
               'unicode/uspoof.h',
               'unicode/utmscale.h',
               'unicode/utrans.h',
               'unicode/vtzone.h',
             ],
           },
           'includes': [
             '../../build/shim_headers.gypi',
           ],
-          'conditions': [
-            ['want_separate_host_toolset==1', {
-              'toolsets': ['target'],
-            }, {
-              'toolsets': ['host', 'target'],
-            }],
-          ],
+          'toolsets': ['target'],
         },
         {
           'target_name': 'icuuc',
           'type': 'none',
           'dependencies': ['system_icu'],
           'export_dependent_settings': ['system_icu'],
           'variables': {
             'headers_root_path': 'source/common',
             'header_filenames': [
               # This list can easily be updated using the command below:
@@ skipping 84 matching lines @@
               'unicode/utrace.h',
               'unicode/utypeinfo.h',
               'unicode/utypes.h',
               'unicode/uvernum.h',
               'unicode/uversion.h',
             ],
           },
           'includes': [
             '../../build/shim_headers.gypi',
           ],
-          'conditions': [
-            ['want_separate_host_toolset==1', {
-              'toolsets': ['target'],
-            }, {
-              'toolsets': ['host', 'target'],
-            }],
-          ],
+          'toolsets': ['target'],
         },
-      ],
+      ], # targets
     }],
-  ],
+  ], # conditions
 }