NaCl: Add the integrated runtime (IRT) library to install images

Mac (x86-32 only):
chrome/chrome_dll.gypi

Linux (x86-32 or x86-64, depending on the target arch):
chrome/chrome_installer.gypi
chrome/tools/build/linux/FILES.cfg

Windows (both x86-32 and x86-64 in the same install image)
chrome/installer/mini_installer.gyp
chrome/installer/mini_installer/chrome.release
chrome/tools/build/win/FILES.cfg

I am not sure if I need to add to the lists in
chrome/tools/build/{linux,win}/FILES.  Since there are files listed in
FILES.cfg that are not in FILES, I will assume not.

BUG=http://code.google.com/p/nativeclient/issues/detail?id=1595
TEST=not sure how to test this, apart from manually testing the
  install images that are produced after this is committed

Review URL: http://codereview.chromium.org/6927015

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

6 files changed, 36 insertions, 0 deletions

diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
index c3a0b05..110a915 100644
--- a/chrome/chrome_dll.gypi
+++ b/chrome/chrome_dll.gypi
@@ -477,6 +477,9 @@
                     ['disable_nacl!=1', {
                       'files': [
                         '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.plugin',
+                        # We leave out nacl_irt_x86_64.nexe because we only
+                        # support x86-32 NaCl on Mac OS X.
+                        '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
                       ],
                     }],
                   ],
diff --git a/chrome/chrome_installer.gypi b/chrome/chrome_installer.gypi
index ebe0f07..fb7adbe 100644
--- a/chrome/chrome_installer.gypi
+++ b/chrome/chrome_installer.gypi
@@ -425,11 +425,15 @@
             'packaging_files_binaries': [
               '<(PRODUCT_DIR)/libgcflashplayer.so',
               '<(PRODUCT_DIR)/plugin.vch',
+              '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
             ],
           }],
           ['target_arch=="x64"', {
             'deb_arch': 'amd64',
             'rpm_arch': 'x86_64',
+            'packaging_files_binaries': [
+              '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
+            ],
           }],
           ['target_arch=="arm"', {
             'deb_arch': 'arm',
diff --git a/chrome/installer/mini_installer.gyp b/chrome/installer/mini_installer.gyp
index a531e90..0e893b8 100644
--- a/chrome/installer/mini_installer.gyp
+++ b/chrome/installer/mini_installer.gyp
@@ -189,6 +189,8 @@
                 '<(PRODUCT_DIR)/nacl64.exe',
                 '<(PRODUCT_DIR)/nacl64.dll',
                 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll',
+                '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
+                '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
                 '<(PRODUCT_DIR)/locales/en-US.dll',
                 '<(PRODUCT_DIR)/icudt.dll',
               ],
diff --git a/chrome/installer/mini_installer/chrome.release b/chrome/installer/mini_installer/chrome.release
index 328032e..1457df1 100644
--- a/chrome/installer/mini_installer/chrome.release
+++ b/chrome/installer/mini_installer/chrome.release
@@ -35,6 +35,8 @@ chrome.dll: %(VersionDir)s\
 nacl64.exe: %(VersionDir)s\

 nacl64.dll: %(VersionDir)s\

 ppGoogleNaClPluginChrome.dll: %(VersionDir)s\

+nacl_irt_x86_32.nexe: %(VersionDir)s\

+nacl_irt_x86_64.nexe: %(VersionDir)s\

 icudt.dll: %(VersionDir)s\

 resources.pak: %(VersionDir)s\

 locales\*.dll: %(VersionDir)s\Locales

diff --git a/chrome/tools/build/linux/FILES.cfg b/chrome/tools/build/linux/FILES.cfg
index 44272ed..921b467 100644
--- a/chrome/tools/build/linux/FILES.cfg
+++ b/chrome/tools/build/linux/FILES.cfg
@@ -102,9 +102,20 @@ FILES = [
     'arch': ['32bit', '64bit'],
     'buildtype': ['dev', 'official'],
   },
+  # Native Client plugin files:
   {
     'filename': 'libppGoogleNaClPluginChrome.so',
     'arch': ['32bit', '64bit'],
     'buildtype': ['dev', 'official'],
   },
+  {
+    'filename': 'nacl_irt_x86_32.nexe',
+    'arch': ['32bit'],
+    'buildtype': ['dev', 'official'],
+  },
+  {
+    'filename': 'nacl_irt_x86_64.nexe',
+    'arch': ['64bit'],
+    'buildtype': ['dev', 'official'],
+  },
 ]
diff --git a/chrome/tools/build/win/FILES.cfg b/chrome/tools/build/win/FILES.cfg
index 8d9a025..5736c14 100644
--- a/chrome/tools/build/win/FILES.cfg
+++ b/chrome/tools/build/win/FILES.cfg
@@ -363,9 +363,23 @@ FILES = [
     'arch': ['32bit', '64bit'],

     'buildtype': ['dev', 'official'],

   },

+  # Native Client plugin files:

   {

     'filename': 'ppGoogleNaClPluginChrome.dll',

     'arch': ['32bit', '64bit'],

     'buildtype': ['dev', 'official'],

   },

+  # Windows Chrome does not have separate x86-32 and x86-64 installs.

+  # A single install supports both x86-32 and x86-64 versions of NaCl,

+  # so the 'arch' field does not seem to make much sense in this case.

+  {

+    'filename': 'nacl_irt_x86_32.nexe',

+    'arch': ['32bit', '64bit'],

+    'buildtype': ['dev', 'official'],

+  },

+  {

+    'filename': 'nacl_irt_x86_64.nexe',

+    'arch': ['32bit', '64bit'],

+    'buildtype': ['dev', 'official'],

+  },

 ]