Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / chrome_dll_bundle.gypi

diff --git a/src/chrome/chrome_dll_bundle.gypi b/src/chrome/chrome_dll_bundle.gypi
index 57bd2b9..e307c3b 100644 (file)
--- a/src/chrome/chrome_dll_bundle.gypi
+++ b/src/chrome/chrome_dll_bundle.gypi
@@ -76,6 +76,7 @@
     # Bring in pdfsqueeze and run it on all pdfs
     '../build/temp_gyp/pdfsqueeze.gyp:pdfsqueeze',
     '../crypto/crypto.gyp:crypto',
+    '../pdf/pdf.gyp:pdf',
     # On Mac, Flash gets put into the framework, so we need this
     # dependency here. flash_player.gyp will copy the Flash bundle
     # into PRODUCT_DIR.
@@ -108,7 +109,6 @@
       }],
     ],
     'libpeer_target_type%': 'static_library',
-    'repack_path': '../tools/grit/grit/format/repack.py',
   },
   'postbuilds': [
     {
@@ -139,25 +139,19 @@
   ],
   'copies': [
     {
-      # Copy FFmpeg binaries for audio/video support.
       'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Libraries',
       'files': [
+        '<(PRODUCT_DIR)/exif.so',
         '<(PRODUCT_DIR)/ffmpegsumo.so',
       ],
     },
     {
       'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Internet Plug-Ins',
-      'files': [],
+      'files': [
+        '<(PRODUCT_DIR)/PDF.plugin',
+      ],
       'conditions': [
-        ['internal_pdf', {
-          'files': [
-            '<(PRODUCT_DIR)/PDF.plugin',
-          ],
-        }],
         ['disable_nacl!=1', {
-          'files': [
-            '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.plugin',
-          ],
           'conditions': [
             ['target_arch=="x64"', {
               'files': [
@@ -241,7 +235,7 @@
     ['mac_breakpad_compiled_in==1', {
       'dependencies': [
         '../breakpad/breakpad.gyp:breakpad',
-        'app/policy/cloud_policy_codegen.gyp:policy',
+        '../components/components.gyp:policy',
       ],
       'copies': [
         {
@@ -279,17 +273,12 @@
         },
       ],
     }],  # mac_keystone
-    ['internal_pdf', {
-      'dependencies': [
-        '../pdf/pdf.gyp:pdf',
-      ],
-    }],
     ['debug_devtools==1', {
       'postbuilds': [{
         'postbuild_name': 'Copy inspector files',
         'action': [
-          'cp',
-          '-r',
+          'ln',
+          '-fs',
           '${BUILT_PRODUCTS_DIR}/resources/inspector',
           '${BUILT_PRODUCTS_DIR}/${CONTENTS_FOLDER_PATH}/Resources',
         ],
@@ -308,5 +297,10 @@
         ],
       }],
     }],
+    ['icu_use_data_file_flag==1', {
+      'mac_bundle_resources': [
+        '<(PRODUCT_DIR)/icudtl.dat',
+      ],
+    }],
   ],  # conditions
 }