build: i18n: further trim

Author: srl295

tools/icu/icu-generic.gyp

@@ -8,9 +8,33 @@
 {
   'variables': {
     'icu_src_derb': [ '../../deps/icu/source/tools/genrb/derb.c' ],
+    'icu_src_trim_common': [
+      # bidi- not needed (yet!)
+      '../../deps/icu/source/common/ubidi.c',
+      '../../deps/icu/source/common/ubidiimp.h',
+      '../../deps/icu/source/common/ubidiln.c',
+      '../../deps/icu/source/common/ubidiwrt.c',
+      '../../deps/icu/source/common/ubidi_props.c',
+      '../../deps/icu/source/common/ubidi_props.h',
+      '../../deps/icu/source/common/ubidi_props_data.h',
+      # windows tz
+      '../../deps/icu/source/common/wintz.c',
+      '../../deps/icu/source/common/wintz.h',
+    ],
   },
   'includes': [ '../../icu_config.gypi' ],
   'targets': [
+    {
+      # a target for additional uconfig defines, target only
+      'target_name': 'icu_uconfig_target',
+      'type': 'none',
+      'toolsets': [ 'target' ],
+      'direct_dependent_settings': {
+        'defines': [
+          'UCONFIG_NO_CONVERSION=1',
+        ]
+      },
+    },
     {
       # a target to hold uconfig defines.
       # for now these are hard coded, but could be defined.
@@ -100,13 +124,13 @@
       'defines': [
         'U_I18N_IMPLEMENTATION=1',
       ],
-      'dependencies': [ 'icuucx', 'icu_implementation', 'icu_uconfig' ],
+      'dependencies': [ 'icuucx', 'icu_implementation', 'icu_uconfig', 'icu_uconfig_target' ],
       'direct_dependent_settings': {
         'include_dirs': [
           '../../deps/icu/source/i18n',
         ],
       },
-      'export_dependent_settings': [ 'icuucx' ],
+      'export_dependent_settings': [ 'icuucx', 'icu_uconfig_target' ],
     },
     # this library is only built for derb..
     {
@@ -308,22 +332,24 @@
       'export_dependent_settings': [ 'icuucx', 'icudata' ],
     },
     # This is the 'real' icuuc.
-    # tools can depend on 'icuuc + stubdata'
     {
       'target_name': 'icuucx',
       'type': '<(library)',
-      'dependencies': [ 'icu_implementation', 'icu_uconfig' ],
+      'dependencies': [ 'icu_implementation', 'icu_uconfig', 'icu_uconfig_target' ],
       'toolsets': [ 'host', 'target' ],
       'sources': [
-        '<@(icu_src_common)'
+        '<@(icu_src_common)',
+      ],
+      'sources!': [
+        '<@(icu_src_trim_common)',
       ],
       'include_dirs': [
         '../../deps/icu/source/common',
       ],
       'defines': [
         'U_COMMON_IMPLEMENTATION=1',
       ],
-      'export_dependent_settings': [ 'icu_uconfig' ],
+      'export_dependent_settings': [ 'icu_uconfig', 'icu_uconfig_target' ],
       'direct_dependent_settings': {
         'include_dirs': [
           '../../deps/icu/source/common',