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

content/content_shell.gypi

Index: content/content_shell.gypi
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index b17ec601ebf6372849cf7910e13ba7713ce2d8fc..76bbbccb7102c4c3606dfa6d123b8431984e82ec 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -403,16 +403,6 @@
             'browser/devtools/devtools_resources.gyp:devtools_resources',
           ],
         }],
-        ['OS=="android"', {
-          'copies': [
-            {
-              'destination': '<(PRODUCT_DIR)',
-              'files': [
-                '<(PRODUCT_DIR)/content_shell/assets/content_shell.pak'
-              ],
-            },
-          ],
-        }],
         ['toolkit_views==1', {
           'dependencies': [
             '<(DEPTH)/ui/views/resources/views_resources.gyp:views_resources'
@@ -437,6 +427,7 @@
               '<(SHARED_INTERMEDIATE_DIR)/ui/strings/app_locale_settings_en-US.pak',
               '<(SHARED_INTERMEDIATE_DIR)/ui/strings/ui_strings_en-US.pak',
             ],
+            'pak_output': '<(PRODUCT_DIR)/content_shell.pak',
             'conditions': [
               ['toolkit_views==1', {
                 'pak_inputs': [
@@ -445,9 +436,6 @@
               }],
               ['OS!="android"', {
                 'pak_inputs': ['<(SHARED_INTERMEDIATE_DIR)/blink/devtools_resources.pak',],
-                'pak_output': '<(PRODUCT_DIR)/content_shell.pak',
-              }, {
-                'pak_output': '<(PRODUCT_DIR)/content_shell/assets/content_shell.pak',
               }],
             ],
           },
@@ -921,9 +909,8 @@
           'target_name': 'content_shell_apk',
           'type': 'none',
           'dependencies': [
-            'content.gyp:content_icudata',
+            'content.gyp:content_shell_assets_copy',
             'content.gyp:content_java',
-            'content.gyp:content_v8_external_data',
             'content_java_test_support',
             'content_shell_java',
             'libcontent_shell_content_view',
@@ -948,18 +935,21 @@
             'conditions': [
               ['icu_use_data_file_flag==1', {
                 'additional_input_paths': [
-                  '<(PRODUCT_DIR)/icudtl.dat',
+                  '<(PRODUCT_DIR)/content_shell/assets/icudtl.dat',

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

<(asset_location)/icudtl.dat

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

Done.

                 ],
               }],
               ['v8_use_external_startup_data==1', {
                 'additional_input_paths': [
-                  '<(PRODUCT_DIR)/natives_blob.bin',
-                  '<(PRODUCT_DIR)/snapshot_blob.bin',
+                  '<(PRODUCT_DIR)/content_shell/assets/natives_blob_<(arch_suffix).bin',

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

similarly, <(asset_location)/native_blob_<(arch_suffix).bin

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

Done.

+                  '<(PRODUCT_DIR)/content_shell/assets/snapshot_blob_<(arch_suffix).bin',

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

here too

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

Done.

                 ],
               }],
             ],
           },
-          'includes': [ '../build/java_apk.gypi' ],
+          'includes': [ 
+            '../build/android/v8_external_startup_data_arch_suffix.gypi',
+            '../build/java_apk.gypi',
+          ],
         },
       ],
     }],  # OS=="android"