Shorten gyp target names for PNaCl IRT shim

These are basically the longest generated names, and the trybots appear
to have shorter overall names than the buildbots, because try jobs pass
and then the builders break.

R=jvoung@chromium.org
TBR=binji@chromium.org, teravest@chromium.org
BUG= https://code.google.com/p/nativeclient/issues/detail?id=3846

Review URL: https://codereview.chromium.org/399523002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@283402 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 25 insertions, 25 deletions

diff --git a/native_client_sdk/src/build_tools/build_sdk.py b/native_client_sdk/src/build_tools/build_sdk.py
index 0e24f60..e451b46 100755
--- a/native_client_sdk/src/build_tools/build_sdk.py
+++ b/native_client_sdk/src/build_tools/build_sdk.py
@@ -500,7 +500,7 @@ def GypNinjaBuild_Pnacl(rel_out_dir, target_arch):
   out_dir = MakeNinjaRelPath(rel_out_dir)
   gyp_file = os.path.join(SRC_DIR, 'ppapi', 'native_client', 'src',
                           'untrusted', 'pnacl_irt_shim', 'pnacl_irt_shim.gyp')
-  targets = ['shim_aot']
+  targets = ['aot']
   GypNinjaBuild(target_arch, gyp_py, gyp_file, targets, out_dir, False)
 
 
diff --git a/ppapi/native_client/native_client.gyp b/ppapi/native_client/native_client.gyp
index 0642e74..977af54 100644
--- a/ppapi/native_client/native_client.gyp
+++ b/ppapi/native_client/native_client.gyp
@@ -251,7 +251,7 @@
             ],
           },
           'dependencies': [
-            'src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:shim_for_irt',
+            'src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:irt',
             '../ppapi_proxy_nacl.gyp:ppapi_proxy_nacl',
             '../ppapi_ipc_nacl.gyp:ppapi_ipc_nacl',
             '../ppapi_shared_nacl.gyp:ppapi_shared_nacl',
diff --git a/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp b/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp
index d3d5f2a..8ba522d 100644
--- a/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp
+++ b/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp
@@ -12,7 +12,7 @@
       # We keep the target names in this file short to avoid having really long
       # path names on Windows.
       # https://code.google.com/p/nativeclient/issues/detail?id=3846
-      'target_name': 'shim_aot',
+      'target_name': 'aot',
       'type': 'none',
       'variables': {
         'nlib_target': 'libpnacl_irt_shim.a',
@@ -53,17 +53,17 @@
     # If we ever change that hook interface or change the in-IRT shim's ABI,
     # we would need to clear the translation cache to match the new IRT.
     {
-      'target_name': 'shim_browser',
+      'target_name': 'browser',
       'type': 'none',
       'variables': {
         # Same output file name as shim_aot, so that we don't need to change
         # the linker commandlines, but output to the "for_browser" directory,
         # and have the pnacl_support_extension copy from that directory.
         'nlib_target': 'libpnacl_irt_shim.a',
-        'out_pnacl_newlib_arm': '>(tc_lib_dir_pnacl_translate)/lib-arm/for_browser/>(nlib_target)',
-        'out_pnacl_newlib_x86_32': '>(tc_lib_dir_pnacl_translate)/lib-x86-32/for_browser/>(nlib_target)',
-        'out_pnacl_newlib_x86_64': '>(tc_lib_dir_pnacl_translate)/lib-x86-64/for_browser/>(nlib_target)',
-        'out_pnacl_newlib_mips': '>(tc_lib_dir_pnacl_translate)/lib-mips32/for_browser/>(nlib_target)',
+        'out_pnacl_newlib_arm': '>(tc_lib_dir_pnacl_translate)/lib-arm/browser/>(nlib_target)',
+        'out_pnacl_newlib_x86_32': '>(tc_lib_dir_pnacl_translate)/lib-x86-32/browser/>(nlib_target)',
+        'out_pnacl_newlib_x86_64': '>(tc_lib_dir_pnacl_translate)/lib-x86-64/browser/>(nlib_target)',
+        'out_pnacl_newlib_mips': '>(tc_lib_dir_pnacl_translate)/lib-mips32/browser/>(nlib_target)',
         'build_glibc': 0,
         'build_newlib': 0,
         'build_pnacl_newlib': 1,
@@ -88,7 +88,7 @@
       # Second half of shim library for PNaCl in-browser translation.
       # This half goes into the IRT and is returned by the unstable
       # IRT hook interface.
-      'target_name': 'shim_for_irt',
+      'target_name': 'irt',
       'type': 'none',
       'variables': {
         'nlib_target': 'libpnacl_irt_shim_for_irt.a',
diff --git a/ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_support_extension.gyp b/ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_support_extension.gyp
index de19ee3..8a048a4 100644
--- a/ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_support_extension.gyp
+++ b/ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_support_extension.gyp
@@ -37,7 +37,7 @@
     'conditions': [
       ['disable_nacl==0 and disable_pnacl==0 and disable_nacl_untrusted==0', {
         'dependencies': [
-          '../../../../../ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:shim_browser',
+          '../../../../../ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:browser',
           '../../../../../native_client/tools.gyp:prep_toolchain',
           'untar_pnacl_translator',
         ],
@@ -77,14 +77,14 @@
                       '<(PRODUCT_DIR)/pnacl/pnacl_public_x86_64_pnacl_llc_nexe',
                     ],
                     'inputs': [
-                      '>(tc_lib_dir_pnacl_translate)/lib-x86-32/for_browser/libpnacl_irt_shim.a',
-                      '>(tc_lib_dir_pnacl_translate)/lib-x86-64/for_browser/libpnacl_irt_shim.a',
+                      '>(tc_lib_dir_pnacl_translate)/lib-x86-32/browser/libpnacl_irt_shim.a',
+                      '>(tc_lib_dir_pnacl_translate)/lib-x86-64/browser/libpnacl_irt_shim.a',
                     ],
                     'variables': {
                       'lib_overrides': [
                         # Use the two freshly generated shims.
-                        '--lib_override=ia32,>(tc_lib_dir_pnacl_translate)/lib-x86-32/for_browser/libpnacl_irt_shim.a',
-                        '--lib_override=x64,>(tc_lib_dir_pnacl_translate)/lib-x86-64/for_browser/libpnacl_irt_shim.a',
+                        '--lib_override=ia32,>(tc_lib_dir_pnacl_translate)/lib-x86-32/browser/libpnacl_irt_shim.a',
+                        '--lib_override=x64,>(tc_lib_dir_pnacl_translate)/lib-x86-64/browser/libpnacl_irt_shim.a',
                       ],
                     },
                 }],
@@ -103,12 +103,12 @@
                           '<(PRODUCT_DIR)/pnacl/pnacl_public_arm_pnacl_llc_nexe',
                         ],
                         'inputs': [
-                          '>(tc_lib_dir_pnacl_translate)/lib-arm/for_browser/libpnacl_irt_shim.a',
+                          '>(tc_lib_dir_pnacl_translate)/lib-arm/browser/libpnacl_irt_shim.a',
                         ],
                         'variables': {
                           'lib_overrides': [
                             # Use the freshly generated shim.
-                            '--lib_override=arm,>(tc_lib_dir_pnacl_translate)/lib-arm/for_browser/libpnacl_irt_shim.a',
+                            '--lib_override=arm,>(tc_lib_dir_pnacl_translate)/lib-arm/browser/libpnacl_irt_shim.a',
                           ],
                         },
                       }],
@@ -124,12 +124,12 @@
                           '<(PRODUCT_DIR)/pnacl/pnacl_public_mips32_llc_nexe',
                         ],
                         'inputs': [
-                          '>(tc_lib_dir_pnacl_translate)/lib-mips32/for_browser/libpnacl_irt_shim.a',
+                          '>(tc_lib_dir_pnacl_translate)/lib-mips32/browser/libpnacl_irt_shim.a',
                         ],
                         'variables': {
                           'lib_overrides': [
                             # Use the freshly generated shim.
-                            '--lib_override=mipsel,>(tc_lib_dir_pnacl_translate)/lib-mips32/for_browser/libpnacl_irt_shim.a',
+                            '--lib_override=mipsel,>(tc_lib_dir_pnacl_translate)/lib-mips32/browser/libpnacl_irt_shim.a',
                           ],
                         },
                       }],
@@ -145,12 +145,12 @@
                           '<(PRODUCT_DIR)/pnacl/pnacl_public_x86_32_pnacl_llc_nexe',
                         ],
                         'inputs': [
-                          '>(tc_lib_dir_pnacl_translate)/lib-x86-32/for_browser/libpnacl_irt_shim.a',
+                          '>(tc_lib_dir_pnacl_translate)/lib-x86-32/browser/libpnacl_irt_shim.a',
                         ],
                         'variables': {
                           'lib_overrides': [
                             # Use the freshly generated shim.
-                            '--lib_override=ia32,>(tc_lib_dir_pnacl_translate)/lib-x86-32/for_browser/libpnacl_irt_shim.a',
+                            '--lib_override=ia32,>(tc_lib_dir_pnacl_translate)/lib-x86-32/browser/libpnacl_irt_shim.a',
                           ],
                         },
                       }],
@@ -166,12 +166,12 @@
                           '<(PRODUCT_DIR)/pnacl/pnacl_public_x86_64_pnacl_llc_nexe',
                         ],
                         'inputs': [
-                          '>(tc_lib_dir_pnacl_translate)/lib-x86-64/for_browser/libpnacl_irt_shim.a',
+                          '>(tc_lib_dir_pnacl_translate)/lib-x86-64/browser/libpnacl_irt_shim.a',
                         ],
                         'variables': {
                           'lib_overrides': [
                             # Use the freshly generated shim.
-                            '--lib_override=x64,>(tc_lib_dir_pnacl_translate)/lib-x86-64/for_browser/libpnacl_irt_shim.a',
+                            '--lib_override=x64,>(tc_lib_dir_pnacl_translate)/lib-x86-64/browser/libpnacl_irt_shim.a',
                           ],
                         },
                       }],
diff --git a/ppapi/ppapi_nacl.gyp b/ppapi/ppapi_nacl.gyp
index 60ce912..8507719 100644
--- a/ppapi/ppapi_nacl.gyp
+++ b/ppapi/ppapi_nacl.gyp
@@ -187,7 +187,7 @@
           },
           # Shim is a dependency for the nexe because we pre-translate.
           'dependencies': [
-            '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:shim_aot',
+            '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:aot',
           ],
           'actions': [
             {
@@ -236,7 +236,7 @@
           },
           # Shim is a dependency for the nexe because we pre-translate.
           'dependencies': [
-            '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:shim_aot',
+            '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:aot',
           ],
           'actions': [
             {
@@ -260,7 +260,7 @@
           },
           # Shim is a dependency for the nexe because we pre-translate.
           'dependencies': [
-            '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:shim_aot',
+            '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:aot',
           ],
           'actions': [
             {