Support Big Endian part 2

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 99 matching lines @@
                     ],
                   }],
                 ],
               }],
             ],
           }],
         },
         {
           'target_name': 'data_assembly',
           'type': 'none',
+          'data_assembly_inputs': [

[Michael Achenbach, 2016/07/22 07:34:08]

Not enough gyp knowledge here. Can we just declare variables in a target block?
No need for a variables block?

[jungshik at Google, 2016/07/22 20:31:13]

Yeah. It works. Thank you for the suggestion. 

+            'scripts/make_data_assembly.py',
+          ],
           'conditions': [
             [ 'target_arch=="mips" or target_arch=="mips64"', {
               'data_assembly_sources': [
                 'common/icudtb.dat',
               ],
               'data_assembly_inputs': [
-                'scripts/make_data_assembly.py',
                 'common/icudtb.dat',
               ],
               'data_assembly_outputs': [
                 '<(SHARED_INTERMEDIATE_DIR)/third_party/icu/icudtb_dat.S',
               ],
-            }],
-            [ 'target_arch!="mips" and target_arch!="mips64"', {
-              'data_assembly_sources': [
-                'common/icudtl.dat',
-              ],
-              'data_assembly_inputs': [
-                'scripts/make_data_assembly.py',
-                'common/icudtl.dat',
-              ],
+            }, { # 'target_arch!="mips" and target_arch!="mips64"'
               'data_assembly_outputs': [
                 '<(SHARED_INTERMEDIATE_DIR)/third_party/icu/icudtl_dat.S',
               ],
+              'conditions': [
+                ['OS == "android"', {
+                  'data_assembly_sources': [
+                    'android/icudtl.dat',
+                  ],
+                  'data_assembly_inputs': [
+                    'android/icudtl.dat',
+                  ],
+                } , { # else: OS!="android"
+                  'data_assembly_sources': [
+                    'common/icudtl.dat',
+                  ],
+                  'data_assembly_inputs': [
+                    'common/icudtl.dat',
+                  ],
+                }], # OS==android
+              ],
             }],
           ],
           'sources': [
             '<@(_data_assembly_sources)',
           ],
           'actions': [
             {
               'action_name': 'make_data_assembly',
               'inputs': [
                 '<@(_data_assembly_inputs)',
               ],
               'outputs': [
                 '<@(_data_assembly_outputs)',
               ],
-              'action': ['python', '<@(_inputs)', '<@(_outputs)'],
+              'target_conditions': [
+                 [ 'OS != "mac" and OS != "ios" and '

[Michael Achenbach, 2016/07/22 07:34:08]

Optional: I have the feeling the condition might be easier to read if turned
around.

[jungshik at Google, 2016/07/22 20:31:13]

Yes !!  I was copying/moving the condition from the previous location (where
mac/icudtl_dat.S used to be used). Turning it around made it much easier to
read. 

+                   '((OS != "android" and OS != "qnx") or '
+                   '_toolset != "host" or host_os != "mac")', {
+                   'action': ['python', '<@(_inputs)', '<@(_outputs)'],
+                 } , {
+                   'action': ['python', '<@(_inputs)', '<@(_outputs)', '--mac'],
+                 }],
+              ],
             },
           ],
         },
         {
           'target_name': 'icudata',
           'type': 'static_library',
           'defines': [
             'U_HIDE_DATA_SYMBOL',
           ],
           'dependencies': [
             'data_assembly#target',
           ],
           'sources': [
-             # These are hand-generated, but will do for now.  The linux
-             # version is an identical copy of the (mac) icudtl_dat.S file,
-             # modulo removal of the .private_extern and .const directives and
-             # with no leading underscore on the icudt52_dat symbol.
-             'android/icudtl_dat.S',
              '<(SHARED_INTERMEDIATE_DIR)/third_party/icu/icudtl_dat.S',
              '<(SHARED_INTERMEDIATE_DIR)/third_party/icu/icudtb_dat.S',
-             'mac/icudtl_dat.S',
           ],
           'conditions': [
             [ 'target_arch=="mips" or target_arch=="mips64"', {
               'sources!': ['<(SHARED_INTERMEDIATE_DIR)/third_party/icu/icudtl_dat.S'],
-            }],
-            [ 'target_arch!="mips" and target_arch!="mips64"', {
+            }, {
               'sources!': ['<(SHARED_INTERMEDIATE_DIR)/third_party/icu/icudtb_dat.S'],
             }],
             [ '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',
               'dependencies!': [
                 'data_assembly#target',
               ],
               'copies': [
                 {
                   'destination': '<(PRODUCT_DIR)',
                   'files': [
                     'windows/icudt.dll',
                   ],
                 },
               ],
             }],
-            [ '(OS == "mac" or OS == "ios") and icu_use_data_file_flag==0', {
-              'type': 'none',
-              'dependencies!': [
-                'data_assembly#target',
-              ],
-            }],
             [ 'icu_use_data_file_flag==1', {
               'type': 'none',
               'dependencies!': [
                 'data_assembly#target',
               ],
               # Remove any assembly data file.
               'sources/': [['exclude', 'icudt[lb]_dat']],
 
               # Make sure any binary depending on this gets the data file.
               'conditions': [
                 ['OS != "ios"', {
                   'dependencies': [
                     'copy_icudt_dat#host',
                   ],
                 } , { # else: OS=="ios"
                   'link_settings': {
                     'mac_bundle_resources': [
                       'common/icudtl.dat',
                     ],
                   },
                 }], # OS!=ios
               ], # conditions
             }], # icu_use_data_file_flag
           ], # conditions
           'target_conditions': [
-            [ 'OS == "win" or OS == "mac" or OS == "ios" or '
-              '(OS == "android" and (_toolset != "host" or host_os != "linux")) or '
-              '(OS == "qnx" and (_toolset == "host" and host_os != "linux"))', {
+            [ 'OS == "win"', {
               'sources!': [
                 '<(SHARED_INTERMEDIATE_DIR)/third_party/icu/icudtl_dat.S',
                 '<(SHARED_INTERMEDIATE_DIR)/third_party/icu/icudtb_dat.S'
               ],
             }],
-            [ 'OS != "android" or _toolset == "host"', {
-              'sources!': ['android/icudtl_dat.S'],
-            }],
-            [ 'OS != "mac" and OS != "ios" and '
-              '((OS != "android" and OS != "qnx") or '
-              '_toolset != "host" or host_os != "mac")', {
-              'sources!': ['mac/icudtl_dat.S'],
-            }],
           ], # target_conditions
         },
         {
           'target_name': 'icui18n',
           'type': '<(component)',
           'sources': [
             '<@(icui18n_sources)',
           ],
           'defines': [
             'U_I18N_IMPLEMENTATION',
@@ skipping 419 matching lines @@
           },
           'includes': [
             '../../build/shim_headers.gypi',
           ],
           'toolsets': ['target'],
         },
       ], # targets
     }],
   ], # conditions
 }