Add NaCl IPC-based proxy IRT nexes to installers.

This adds nacl_ipc_irt_x86_*.nexes to the installers for all platforms. The
proxy is enabled with the flag --enable-nacl-ipc-proxy.
BUG=116317
TEST=install and run
Review URL: https://codereview.chromium.org/11031049

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

8 files changed, 42 insertions, 1 deletions

diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
index b70ab12..d7c8c07 100644
--- a/chrome/chrome_dll.gypi
+++ b/chrome/chrome_dll.gypi
@@ -363,9 +363,10 @@
                     ['disable_nacl!=1', {
                       'files': [
                         '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.plugin',
-                        # We leave out nacl_irt_x86_64.nexe because we only
+                        # We leave out x86-64 IRT nexes because we only
                         # support x86-32 NaCl on Mac OS X.
                         '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
+                        '<(PRODUCT_DIR)/nacl_ipc_irt_x86_32.nexe',
                       ],
                     }],
                   ],
diff --git a/chrome/chrome_installer.gypi b/chrome/chrome_installer.gypi
index 4357e17..c73c5d9 100644
--- a/chrome/chrome_installer.gypi
+++ b/chrome/chrome_installer.gypi
@@ -536,6 +536,7 @@
             'rpm_arch': 'i386',
             'packaging_files_binaries': [
               '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
+              '<(PRODUCT_DIR)/nacl_ipc_irt_x86_32.nexe',
             ],
           }],
           ['target_arch=="x64"', {
@@ -543,6 +544,7 @@
             'rpm_arch': 'x86_64',
             'packaging_files_binaries': [
               '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
+              '<(PRODUCT_DIR)/nacl_ipc_irt_x86_64.nexe',
             ],
           }],
           ['target_arch=="arm"', {
diff --git a/chrome/installer/mini_installer.gyp b/chrome/installer/mini_installer.gyp
index 4b94b89..18636cf 100644
--- a/chrome/installer/mini_installer.gyp
+++ b/chrome/installer/mini_installer.gyp
@@ -225,6 +225,8 @@
                     '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll',
                     '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
                     '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
+                    '<(PRODUCT_DIR)/nacl_ipc_irt_x86_32.nexe',
+                    '<(PRODUCT_DIR)/nacl_ipc_irt_x86_64.nexe',
                   ],
                 }],
               ],
@@ -237,6 +239,8 @@
                 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll',
                 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
                 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
+                '<(PRODUCT_DIR)/nacl_ipc_irt_x86_32.nexe',
+                '<(PRODUCT_DIR)/nacl_ipc_irt_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 ef92ab9..2cae535 100644
--- a/chrome/installer/mini_installer.gypi
+++ b/chrome/installer/mini_installer.gypi
@@ -187,6 +187,8 @@
         '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll',
         '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
         '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
+        '<(PRODUCT_DIR)/nacl_ipc_irt_x86_32.nexe',
+        '<(PRODUCT_DIR)/nacl_ipc_irt_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 f8a6a07..eea2ae1 100644
--- a/chrome/installer/mini_installer/chrome.release
+++ b/chrome/installer/mini_installer/chrome.release
@@ -11,6 +11,8 @@ nacl64.exe: %(VersionDir)s\
 ppGoogleNaClPluginChrome.dll: %(VersionDir)s\
 nacl_irt_x86_32.nexe: %(VersionDir)s\
 nacl_irt_x86_64.nexe: %(VersionDir)s\
+nacl_ipc_irt_x86_32.nexe: %(VersionDir)s\
+nacl_ipc_irt_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 128bd2e..b8c97eb 100644
--- a/chrome/tools/build/chromeos/FILES.cfg
+++ b/chrome/tools/build/chromeos/FILES.cfg
@@ -127,6 +127,16 @@ FILES = [
     'buildtype': ['dev', 'official'],
   },
   {
+    'filename': 'nacl_ipc_irt_x86_32.nexe',
+    'arch': ['32bit'],
+    'buildtype': ['dev', 'official'],
+  },
+  {
+    'filename': 'nacl_ipc_irt_x86_64.nexe',
+    'arch': ['64bit'],
+    'buildtype': ['dev', 'official'],
+  },
+  {
     'filename': 'nacl_helper',
     'arch': ['32bit', '64bit'],
     'buildtype': ['dev', 'official'],
diff --git a/chrome/tools/build/linux/FILES.cfg b/chrome/tools/build/linux/FILES.cfg
index 429b69eb..160e286 100644
--- a/chrome/tools/build/linux/FILES.cfg
+++ b/chrome/tools/build/linux/FILES.cfg
@@ -136,6 +136,16 @@ FILES = [
     'buildtype': ['dev', 'official'],
   },
   {
+    'filename': 'nacl_ipc_irt_x86_32.nexe',
+    'arch': ['32bit'],
+    'buildtype': ['dev', 'official'],
+  },
+  {
+    'filename': 'nacl_ipc_irt_x86_64.nexe',
+    'arch': ['64bit'],
+    'buildtype': ['dev', 'official'],
+  },
+  {
     'filename': 'nacl_helper',
     'arch': ['32bit', '64bit'],
     'buildtype': ['dev', 'official'],
diff --git a/chrome/tools/build/win/FILES.cfg b/chrome/tools/build/win/FILES.cfg
index d14d382..2be6fe2 100644
--- a/chrome/tools/build/win/FILES.cfg
+++ b/chrome/tools/build/win/FILES.cfg
@@ -436,6 +436,16 @@ FILES = [
     'arch': ['32bit', '64bit'],
     'buildtype': ['dev', 'official'],
   },
+  {
+    'filename': 'nacl_ipc_irt_x86_32.nexe',
+    'arch': ['32bit', '64bit'],
+    'buildtype': ['dev', 'official'],
+  },
+  {
+    'filename': 'nacl_ipc_irt_x86_64.nexe',
+    'arch': ['32bit', '64bit'],
+    'buildtype': ['dev', 'official'],
+  },
   # Remoting files:
   {
     'filename': 'chromoting.msi',