Remove the SRPC IRT nexes from Chrome installers.

The nexes are still built so we can run SRPC tests.
BUG=154443
TEST=manual

Review URL: https://chromiumcodereview.appspot.com/11783036

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

8 files changed, 1 insertions, 40 deletions

diff --git a/chrome/chrome_dll_bundle.gypi b/chrome/chrome_dll_bundle.gypi
index 4c84b04..e832770 100644
--- a/chrome/chrome_dll_bundle.gypi
+++ b/chrome/chrome_dll_bundle.gypi
@@ -158,10 +158,9 @@
         ['disable_nacl!=1', {
           'files': [
             '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.plugin',
-            # We leave out x86-64 IRT nexes because we only
+            # We leave out the x86-64 IRT nexe because we only
             # support x86-32 NaCl on Mac OS X.
             '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
-            '<(PRODUCT_DIR)/nacl_irt_srpc_x86_32.nexe',
           ],
         }],
       ],
diff --git a/chrome/chrome_installer.gypi b/chrome/chrome_installer.gypi
index bef9c8f..abb2791 100644
--- a/chrome/chrome_installer.gypi
+++ b/chrome/chrome_installer.gypi
@@ -553,7 +553,6 @@
             'rpm_arch': 'i386',
             'packaging_files_binaries': [
               '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
-              '<(PRODUCT_DIR)/nacl_irt_srpc_x86_32.nexe',
             ],
           }],
           ['target_arch=="x64"', {
@@ -561,7 +560,6 @@
             'rpm_arch': 'x86_64',
             'packaging_files_binaries': [
               '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
-              '<(PRODUCT_DIR)/nacl_irt_srpc_x86_64.nexe',
             ],
           }],
           ['target_arch=="arm"', {
diff --git a/chrome/installer/mini_installer.gyp b/chrome/installer/mini_installer.gyp
index c843b00..a01ffe8 100644
--- a/chrome/installer/mini_installer.gyp
+++ b/chrome/installer/mini_installer.gyp
@@ -225,8 +225,6 @@
                     '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll',
                     '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
                     '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
-                    '<(PRODUCT_DIR)/nacl_irt_srpc_x86_32.nexe',
-                    '<(PRODUCT_DIR)/nacl_irt_srpc_x86_64.nexe',
                   ],
                 }],
               ],
@@ -239,8 +237,6 @@
                 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll',
                 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
                 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
-                '<(PRODUCT_DIR)/nacl_irt_srpc_x86_32.nexe',
-                '<(PRODUCT_DIR)/nacl_irt_srpc_x86_64.nexe',
                 '<(PRODUCT_DIR)/locales/en-US.pak',
                 '<(PRODUCT_DIR)/icudt.dll',
               ],
diff --git a/chrome/installer/mini_installer.gypi b/chrome/installer/mini_installer.gypi
index c0e4ee9..9bba3ae 100644
--- a/chrome/installer/mini_installer.gypi
+++ b/chrome/installer/mini_installer.gypi
@@ -186,8 +186,6 @@
         '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll',
         '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
         '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
-        '<(PRODUCT_DIR)/nacl_irt_srpc_x86_32.nexe',
-        '<(PRODUCT_DIR)/nacl_irt_srpc_x86_64.nexe',
         '<(PRODUCT_DIR)/locales/en-US.pak',
         '<(PRODUCT_DIR)/icudt.dll',
       ],
diff --git a/chrome/installer/mini_installer/chrome.release b/chrome/installer/mini_installer/chrome.release
index e35e03d..be0715c 100644
--- a/chrome/installer/mini_installer/chrome.release
+++ b/chrome/installer/mini_installer/chrome.release
@@ -11,8 +11,6 @@ nacl64.exe: %(VersionDir)s\
 ppGoogleNaClPluginChrome.dll: %(VersionDir)s\
 nacl_irt_x86_32.nexe: %(VersionDir)s\
 nacl_irt_x86_64.nexe: %(VersionDir)s\
-nacl_irt_srpc_x86_32.nexe: %(VersionDir)s\
-nacl_irt_srpc_x86_64.nexe: %(VersionDir)s\
 icudt.dll: %(VersionDir)s\
 resources.pak: %(VersionDir)s\
 chrome_100_percent.pak: %(VersionDir)s\
diff --git a/chrome/tools/build/chromeos/FILES.cfg b/chrome/tools/build/chromeos/FILES.cfg
index 105316f..aabd236 100644
--- a/chrome/tools/build/chromeos/FILES.cfg
+++ b/chrome/tools/build/chromeos/FILES.cfg
@@ -109,16 +109,6 @@ FILES = [
     'buildtype': ['dev', 'official'],
   },
   {
-    'filename': 'nacl_irt_srpc_x86_32.nexe',
-    'arch': ['32bit'],
-    'buildtype': ['dev', 'official'],
-  },
-  {
-    'filename': 'nacl_irt_srpc_x86_64.nexe',
-    'arch': ['64bit'],
-    'buildtype': ['dev', 'official'],
-  },
-  {
     'filename': 'nacl_helper',
     'buildtype': ['dev', 'official'],
   },
diff --git a/chrome/tools/build/linux/FILES.cfg b/chrome/tools/build/linux/FILES.cfg
index db3890d..573897a 100644
--- a/chrome/tools/build/linux/FILES.cfg
+++ b/chrome/tools/build/linux/FILES.cfg
@@ -123,16 +123,6 @@ FILES = [
     'buildtype': ['dev', 'official'],
   },
   {
-    'filename': 'nacl_irt_srpc_x86_32.nexe',
-    'arch': ['32bit'],
-    'buildtype': ['dev', 'official'],
-  },
-  {
-    'filename': 'nacl_irt_srpc_x86_64.nexe',
-    'arch': ['64bit'],
-    'buildtype': ['dev', 'official'],
-  },
-  {
     'filename': 'nacl_irt_srpc_arm.nexe',
     'arch': ['arm'],
     'buildtype': ['dev', 'official'],
diff --git a/chrome/tools/build/win/FILES.cfg b/chrome/tools/build/win/FILES.cfg
index d114c38..8cc6590 100644
--- a/chrome/tools/build/win/FILES.cfg
+++ b/chrome/tools/build/win/FILES.cfg
@@ -351,14 +351,6 @@ FILES = [
     'filename': 'nacl_irt_x86_64.nexe',
     'buildtype': ['dev', 'official'],
   },
-  {
-    'filename': 'nacl_irt_srpc_x86_32.nexe',
-    'buildtype': ['dev', 'official'],
-  },
-  {
-    'filename': 'nacl_irt_srpc_x86_64.nexe',
-    'buildtype': ['dev', 'official'],
-  },
   # Remoting files:
   {
     'filename': 'chromoting.msi',