[Android WebView] Prepare loading error messages for TC

android_webview/android_webview.gyp

 # Copyright 2009 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': {
     'chromium_code': 1,
   },
   'targets': [
     {
       'target_name': 'android_webview_pak',
@@ skipping 10 matching lines @@
             'arch_suffix':'32'
           }],
           ['target_arch=="arm64" or target_arch=="x64" or target_arch=="mips64el"', {
             'arch_suffix':'64'
           }],
         ],
         'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/android_webview',
       },
       'actions': [
         {
-          'action_name': 'generate_aw_renderer_resources',
+          'action_name': 'generate_aw_resources',
           'variables': {
-            'grit_grd_file': 'renderer/aw_renderer_resources.grd',
+            'grit_grd_file': 'ui/aw_resources.grd',
           },
           'includes': [ '../build/grit_action.gypi' ],
         },
         {
           'action_name': 'repack_android_webview_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/content_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent.pak',
-              '<(grit_out_dir)/aw_renderer_resources.pak',
+              '<(grit_out_dir)/aw_resources.pak',
             ],
             'pak_output': '<(PRODUCT_DIR)/android_webview_assets/webviewchromium.pak',
           },
          'includes': [ '../build/repack_action.gypi' ],
         },
         {
-          'action_name': 'android_webview_locales_rename_paks',
+          'action_name': 'generate_aw_strings',
           'variables': {
-            'rename_locales': 'tools/webview_locales_rename_paks.py',
+            'grit_grd_file': 'ui/aw_strings.grd',
+          },
+          'includes': [ '../build/grit_action.gypi' ],
+        },
+        {
+          'action_name': 'android_webview_repack_locales',
+          'variables': {
+            'repack_locales': 'tools/webview_repack_locales.py',
           },
           'inputs': [
-            '<(rename_locales)',
-            '<!@pymod_do_main(webview_locales_rename_paks -i -p <(PRODUCT_DIR) -s <(SHARED_INTERMEDIATE_DIR) <(locales))'
+            '<(repack_locales)',
+            '<!@pymod_do_main(webview_repack_locales -i -p <(PRODUCT_DIR) -s <(SHARED_INTERMEDIATE_DIR) <(locales))'
           ],
           'outputs': [
-            '<!@pymod_do_main(webview_locales_rename_paks -o -p <(PRODUCT_DIR) -s <(SHARED_INTERMEDIATE_DIR) <(locales))'
+            '<!@pymod_do_main(webview_repack_locales -o -p <(PRODUCT_DIR) -s <(SHARED_INTERMEDIATE_DIR) <(locales))'
           ],
           'action': [
             'python',
-            '<(rename_locales)',
+            '<(repack_locales)',
             '-p', '<(PRODUCT_DIR)',
             '-s', '<(SHARED_INTERMEDIATE_DIR)',
             '<@(locales)',
           ],
         },
         {
           'action_name': 'rename_snapshot_blob',
           'inputs': [
             '<(PRODUCT_DIR)/snapshot_blob.bin',
           ],
@@ skipping 317 matching lines @@
         'java_in_dir': 'glue/java',
         'resource_dir': 'apk/java/res',
       },
       'includes': [ 'apk/system_webview_apk_common.gypi' ],
     },
   ],
   'includes': [
     'android_webview_tests.gypi',
   ],
 }