Use icudat*.dat file on Mac

chrome/chrome_dll_bundle.gypi

 # 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.
 
 # This file contains resources for the main Mac chromium bundle.
 {
   # The main browser executable's name is <(mac_product_name).
   # Certain things will get confused if two modules in the
   # executable share the same name, so append " Framework" to the
   # product_name used for the framework.  This will result in
@@ skipping 50 matching lines @@
     'app/theme/menu_overflow_down.pdf',
     'app/theme/menu_overflow_up.pdf',
     'browser/mac/install.sh',
     '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_100_percent.pak',
     '<(SHARED_INTERMEDIATE_DIR)/repack/resources.pak',
     '<!@pymod_do_main(repack_locales -o -p <(OS) -g <(grit_out_dir) -s <(SHARED_INTERMEDIATE_DIR) -x <(SHARED_INTERMEDIATE_DIR) <(locales))',
     # Note: pseudo_locales are generated via the packed_resources
     # dependency but not copied to the final target.  See
     # common.gypi for more info.
   ],
+  'conditions': [
+    ['icu_use_data_file_flag', {

[Mark Mentovai, 2013/12/18 19:04:04]

It’s more usual to write

  icu_use_data_file_flag!=0

[jungshik at Google, 2013/12/18 19:53:19]

will do

+      'mac_bundle_resources': [
+        '<(DEPTH)/third_party/icu/source/data/in/icudtl.dat',

[Mark Mentovai, 2013/12/18 19:04:04]

Did you have something else copy the data file to <(PRODUCT_DIR) already? That
might be a more convenient place to pick it up.

Same in content_shell.gypi.

[jungshik at Google, 2013/12/18 19:53:19]

There's a mac_bundle_resources {} right above my addition that bundles a bunch
of files. In patch set 1, I just added icudtl.dat to that block, which obviously
has a problem of copying icudtl.dat even when icu_use_data_file_flag == 0. 

To avoid that, I tried 'conditions' and 'target_conditions', but the former
didn't work (icu*dat is not copied) and the latter led to an undefined variable
error. 

+      ],
+    }],
+  ],
   'mac_bundle_resources!': [
     'app/framework-Info.plist',
   ],
   'dependencies': [
     'app_mode_app',
     # Bring in pdfsqueeze and run it on all pdfs
     '../build/temp_gyp/pdfsqueeze.gyp:pdfsqueeze',
     '../crypto/crypto.gyp:crypto',
     # On Mac, Flash gets put into the framework, so we need this
     # dependency here. flash_player.gyp will copy the Flash bundle
@@ skipping 130 matching lines @@
       ],
     },
     {
       'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/resources',
       'files': [
         # Loader bundle for platform apps.
         '<(PRODUCT_DIR)/app_mode_loader.app',
       ],
     },
   ],
   'conditions': [

[Mark Mentovai, 2013/12/18 20:02:57]

This overwrites the “conditions” block on line 71.

     ['branding=="Chrome"', {
       'copies': [
         {
           # This location is for the Mac build. Note that the
           # copying of these files for Windows and Linux is handled
           # in chrome.gyp, as Mac needs to be dropped inside the
           # framework.
           'destination':
               '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Default Apps',
           'files': ['<@(default_apps_list)'],
@@ skipping 71 matching lines @@
     ['enable_webrtc==1 and libpeer_target_type!="static_library"', {
       'copies': [{
        'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Libraries',
        'files': [
           '<(PRODUCT_DIR)/libpeerconnection.so',
         ],
       }],
     }],
   ],  # conditions
 }