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

chromecast/chromecast.gyp

 # Copyright 2014 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.
 
 {
   'variables': {
     'android_support_v13_target%':
         '../third_party/android_tools/android_tools.gyp:android_support_v13_javalib',
     'cast_build_release': 'internal/build/cast_build_release',
     'cast_is_debug_build%': 0,
@@ skipping 520 matching lines @@
         'graphics/cast_egl_platform_default.cc',
         'graphics/graphics_properties_default.cc',
         'graphics/osd_plane_default.cc'
       ],
     }
   ],  # end of targets
 
   # 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',
           'type': 'none',
           'dependencies': [
             '../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',
           'type': 'shared_library',
           'dependencies': [
             'cast_jni_headers',
             'cast_shell_common',
             'cast_shell_icudata',
             'cast_shell_pak',
             'cast_version_header',
@@ skipping 82 matching lines @@
             # Unfortunately, the java_apk.gypi target rigidly insists on having
             # a java_in_dir directory, but complains about duplicate classes
             # from the common cast_shell_java target (shared with internal APK)
             # if the actual Java path is used.
             # This will hopefully be removable after the great GN migration.
             'java_in_dir': 'android',
             'android_manifest_path': '<(SHARED_INTERMEDIATE_DIR)/cast_shell_manifest/AndroidManifest.xml',
             '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' ],
         },
         {
           'target_name': 'cast_jni_headers',
           'type': 'none',
           'sources': [
             'base/java/src/org/chromium/chromecast/base/ChromecastConfigAndroid.java',
             'base/java/src/org/chromium/chromecast/base/DumpstateWriter.java',
             'base/java/src/org/chromium/chromecast/base/SystemTimeChangeNotifierAndroid.java',
@@ skipping 89 matching lines @@
             'cast_shell_core',
           ],
           'sources': [
             'app/cast_main.cc',
           ],
         },
       ],  # end of targets
     }],
   ],  # end of conditions
 }