Shorten gyp target names for PNaCl IRT Shim

These names get expanded twice into the pathnames of some built files
which in some cases cause them to exceed Windows' MAX_PATH limit and
kill the build. This reduces those path lengths by ~20 chars.

e.g. ../../../../../out/Release_x64/obj/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim_aot.gen/pnacl_newlib_x86_32-nonsfi/pnacl_irt_shim_aot/irt_shim_ppapi.o.d

becomes
../../../../../out/Release_x64/obj/ppapi/native_client/src/untrusted/pnacl_irt_shim/shim_aot.gen/pnacl_newlib_x86_32-nonsfi/shim_aot/irt_shim_ppapi.o.d

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

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

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

5 files changed, 13 insertions, 11 deletions

diff --git a/native_client_sdk/src/build_tools/build_sdk.py b/native_client_sdk/src/build_tools/build_sdk.py
index 3f2b8fb5..531bbd1 100755
--- a/native_client_sdk/src/build_tools/build_sdk.py
+++ b/native_client_sdk/src/build_tools/build_sdk.py
@@ -502,7 +502,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 = ['pnacl_irt_shim_aot']
+  targets = ['shim_aot']
   GypNinjaBuild(target_arch, gyp_py, gyp_file, targets, out_dir, False)
 
 
@@ -1030,4 +1030,3 @@ if __name__ == '__main__':
     sys.exit(main(sys.argv))
   except KeyboardInterrupt:
     buildbot_common.ErrorExit('build_sdk: interrupted')
-
diff --git a/ppapi/native_client/native_client.gyp b/ppapi/native_client/native_client.gyp
index 5621cbc..97dc9c7 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:pnacl_irt_shim_for_irt',
+            'src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:shim_for_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 1dae487..d3d5f2a 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
@@ -9,7 +9,10 @@
   'targets': [
     {
       # The full library, which PNaCl uses for offline .pexe -> .nexe.
-      'target_name': 'pnacl_irt_shim_aot',
+      # 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',
       'type': 'none',
       'variables': {
         'nlib_target': 'libpnacl_irt_shim.a',
@@ -50,10 +53,10 @@
     # 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': 'pnacl_irt_shim_browser',
+      'target_name': 'shim_browser',
       'type': 'none',
       'variables': {
-        # Same name as pnacl_irt_shim_aot, so that we don't need to change
+        # 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',
@@ -85,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': 'pnacl_irt_shim_for_irt',
+      'target_name': 'shim_for_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 ab6414e..fbc48a7 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
@@ -36,7 +36,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:pnacl_irt_shim_browser',
+          '../../../../../ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:shim_browser',
           '../../../../../native_client/tools.gyp:prep_toolchain',
           'untar_pnacl_translator',
         ],
diff --git a/ppapi/ppapi_nacl.gyp b/ppapi/ppapi_nacl.gyp
index 3f31f57..1853780 100644
--- a/ppapi/ppapi_nacl.gyp
+++ b/ppapi/ppapi_nacl.gyp
@@ -186,7 +186,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:pnacl_irt_shim_aot',
+            '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:shim_aot',
           ],
           'actions': [
             {
@@ -221,7 +221,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:pnacl_irt_shim_aot',
+            '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:shim_aot',
           ],
           'actions': [
             {
@@ -245,7 +245,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:pnacl_irt_shim_aot',
+            '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:shim_aot',
           ],
           'actions': [
             {