Reland Reland Switch Chrome Android using v8 arch specific external data name

chromecast/chromecast.gyp

Index: chromecast/chromecast.gyp
diff --git a/chromecast/chromecast.gyp b/chromecast/chromecast.gyp
index e71e25ce2696d95755b8e793ebe7a70836cebced..e68380fa21b09a5f87b3392745a5e9e4a3cd209e 100644
--- a/chromecast/chromecast.gyp
+++ b/chromecast/chromecast.gyp
@@ -538,6 +538,7 @@
   # Targets for Android receiver.
   'conditions': [
     ['OS=="android"', {
+      'includes': ['../build/android/v8_external_startup_data_arch_suffix.gypi',],

[jbudorick, 2015/10/26 23:02:04]

Curious -- why did you move this outside?

[michaelbai, 2015/10/27 01:10:42]

Because the arch_suffix variable is needed by 2 targets 

[jbudorick, 2015/10/27 01:14:58]

ah, ok. Makes sense.

       'targets': [
         {
           'target_name': 'cast_shell_icudata',
@@ -546,14 +547,22 @@
             '../third_party/icu/icu.gyp:icudata',
             '../v8/tools/gyp/v8.gyp:v8_external_snapshot',
           ],
-          'copies': [{
-            'destination': '<(PRODUCT_DIR)/assets',
-            'files': [
+          'variables': {
+            'dest_path': '<(PRODUCT_DIR)/assets',

[jbudorick, 2015/10/26 23:02:04]

Shouldn't this be copying to something target-specific rather than
<(PRODUCT_DIR)/assets/? Couldn't that collide with other targets?

[michaelbai, 2015/10/27 01:10:42]

It doesn't collide with others now because one one report errors, but I changed
it for sake of safe.

[jbudorick, 2015/10/27 01:14:58]

Thanks.

+            'src_files': [
               '<(PRODUCT_DIR)/icudtl.dat',
+            ],
+            'renaming_sources': [
               '<(PRODUCT_DIR)/natives_blob.bin',
               '<(PRODUCT_DIR)/snapshot_blob.bin',
             ],
-          }],
+            'renaming_destinations': [
+              'natives_blob_<(arch_suffix).bin',
+              'snapshot_blob_<(arch_suffix).bin',
+            ],
+            'clear': 1,
+          },
+          'includes': ['../build/android/copy_ex.gypi'],
         },
         {
           'target_name': 'libcast_shell_android',
@@ -656,7 +665,12 @@
             'package_name': 'org.chromium.chromecast.shell',
             'native_lib_target': 'libcast_shell_android',
             'asset_location': '<(PRODUCT_DIR)/assets',
-            'additional_input_paths': ['<(PRODUCT_DIR)/assets/cast_shell.pak'],
+            'additional_input_paths': [
+               '<(PRODUCT_DIR)/assets/cast_shell.pak',
+               '<(PRODUCT_DIR)/assets/icudtl.dat',
+               '<(PRODUCT_DIR)/assets/natives_blob_<(arch_suffix).bin',
+               '<(PRODUCT_DIR)/assets/snapshot_blob_<(arch_suffix).bin',
+            ],
           },
           'includes': [ '../build/java_apk.gypi' ],
         },