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

content/content_shell.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.
 
 {
   'variables': {
     'content_shell_product_name': 'Content Shell',
     # The "19" is so that sites that sniff for version think that this is
     # something reasonably current; the "77.34.5" is a hint that this isn't a
     # standard Chrome.
@@ skipping 385 matching lines @@
         '<(DEPTH)/third_party/WebKit/public/blink_resources.gyp:blink_resources',
         '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources',
         '<(DEPTH)/ui/strings/ui_strings.gyp:ui_strings',
       ],
       'conditions': [
         ['OS!="android"', {
           'dependencies': [
             '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'
           ],
         }],
       ],
       'actions': [
         {
           'action_name': 'repack_content_shell_pack',
           'variables': {
             'pak_inputs': [
               '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_image_resources_100_percent.pak',
               '<(SHARED_INTERMEDIATE_DIR)/content/app/resources/content_resources_100_percent.pak',
               '<(SHARED_INTERMEDIATE_DIR)/content/app/strings/content_strings_en-US.pak',
               '<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/content/shell_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent.pak',
               '<(SHARED_INTERMEDIATE_DIR)/ui/resources/webui_resources.pak',
               '<(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': [
                   '<(SHARED_INTERMEDIATE_DIR)/ui/views/resources/views_resources_100_percent.pak',
                 ],
               }],
               ['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',
               }],
             ],
           },
           'includes': [ '../build/repack_action.gypi' ],
         },
       ],
     },
     {
       # GN version: //content/shell:content_shell
       'target_name': 'content_shell',
@@ skipping 453 matching lines @@
             'jinja_inputs': ['shell/android/shell_apk/AndroidManifest.xml.jinja2'],
             'jinja_output': '<(SHARED_INTERMEDIATE_DIR)/content_shell_manifest/AndroidManifest.xml',
           },
           'includes': [ '../build/android/jinja_template.gypi' ],
         },
         {
           # GN version: //content/shell/android:content_shell_apk
           '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',
             '../base/base.gyp:base_java',
             '../media/media.gyp:media_java',
             '../net/net.gyp:net_java',
             '../third_party/mesa/mesa.gyp:osmesa_in_lib_dir',
             '../tools/android/forwarder/forwarder.gyp:forwarder',
             '../tools/imagediff/image_diff.gyp:image_diff#host',
             '../ui/android/ui_android.gyp:ui_java',
           ],
           'variables': {
             'apk_name': 'ContentShell',
             'manifest_package_name': 'org.chromium.content_shell_apk',
             'android_manifest_path': '<(SHARED_INTERMEDIATE_DIR)/content_shell_manifest/AndroidManifest.xml',
             'java_in_dir': 'shell/android/shell_apk',
             'resource_dir': 'shell/android/shell_apk/res',
             'native_lib_target': 'libcontent_shell_content_view',
             'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/content_shell.pak'],
             'asset_location': '<(PRODUCT_DIR)/content_shell/assets',
             'extra_native_libs': ['<(SHARED_LIB_DIR)/libosmesa.so'],
             '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"
     ['OS=="win"', {
       'targets': [
         {
           # GN version: //content/shell:crash_service
           'target_name': 'content_shell_crash_service',
           'type': 'executable',
           'dependencies': [
@@ skipping 42 matching lines @@
                 '--input_symbol', '<(PRODUCT_DIR)/content_shell.exe.pdb',
                 '--destination_dir', '<(dest_dir)',
               ],
             },
           ],
         },
       ],
     }],  # OS=="win" and fastbuild==0 and target_arch=="ia32"
   ]
 }