diff options
author | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-29 21:37:17 +0000 |
---|---|---|
committer | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-29 21:37:17 +0000 |
commit | f37fd1bb6ce9f2227989f249f7e8cc206cc8da04 (patch) | |
tree | 085407e175422a13b228b3bc56ba7f8ed7980099 /chrome | |
parent | 5b6413f7eaf2c41cded749e442d12bb9aa24bf84 (diff) | |
download | chromium_src-f37fd1bb6ce9f2227989f249f7e8cc206cc8da04.zip chromium_src-f37fd1bb6ce9f2227989f249f7e8cc206cc8da04.tar.gz chromium_src-f37fd1bb6ce9f2227989f249f7e8cc206cc8da04.tar.bz2 |
Remove the NaCl IPC IRT nexes from Chrome installers, prior to M24 branch.
This removes the .nexes from the installer. A follow-up patch will reset
SIZES checks back to where they were before this. I will reland this CL on
trunk after the branch point.
BUG=156740, 116317
TEST=none
Review URL: https://codereview.chromium.org/11340012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164744 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r-- | chrome/chrome_dll.gypi | 3 | ||||
-rw-r--r-- | chrome/chrome_installer.gypi | 2 | ||||
-rw-r--r-- | chrome/installer/mini_installer.gyp | 4 | ||||
-rw-r--r-- | chrome/installer/mini_installer.gypi | 2 | ||||
-rw-r--r-- | chrome/installer/mini_installer/chrome.release | 2 | ||||
-rw-r--r-- | chrome/tools/build/chromeos/FILES.cfg | 10 | ||||
-rw-r--r-- | chrome/tools/build/linux/FILES.cfg | 10 | ||||
-rw-r--r-- | chrome/tools/build/win/FILES.cfg | 10 |
8 files changed, 1 insertions, 42 deletions
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi index 052952c..9e8cd00 100644 --- a/chrome/chrome_dll.gypi +++ b/chrome/chrome_dll.gypi @@ -363,10 +363,9 @@ ['disable_nacl!=1', { 'files': [ '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.plugin', - # We leave out x86-64 IRT nexes because we only + # 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', - '<(PRODUCT_DIR)/nacl_ipc_irt_x86_32.nexe', ], }], ], diff --git a/chrome/chrome_installer.gypi b/chrome/chrome_installer.gypi index ea02442..77a983f 100644 --- a/chrome/chrome_installer.gypi +++ b/chrome/chrome_installer.gypi @@ -545,7 +545,6 @@ 'rpm_arch': 'i386', 'packaging_files_binaries': [ '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', - '<(PRODUCT_DIR)/nacl_ipc_irt_x86_32.nexe', ], }], ['target_arch=="x64"', { @@ -553,7 +552,6 @@ '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 18636cf..4b94b89 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_ipc_irt_x86_32.nexe', - '<(PRODUCT_DIR)/nacl_ipc_irt_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_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 2cae535..ef92ab9 100644 --- a/chrome/installer/mini_installer.gypi +++ b/chrome/installer/mini_installer.gypi @@ -187,8 +187,6 @@ '<(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 1335177..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_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 b8c97eb..128bd2e 100644 --- a/chrome/tools/build/chromeos/FILES.cfg +++ b/chrome/tools/build/chromeos/FILES.cfg @@ -127,16 +127,6 @@ 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 160e286..429b69eb 100644 --- a/chrome/tools/build/linux/FILES.cfg +++ b/chrome/tools/build/linux/FILES.cfg @@ -136,16 +136,6 @@ 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 93511d2..ebe8e3d 100644 --- a/chrome/tools/build/win/FILES.cfg +++ b/chrome/tools/build/win/FILES.cfg @@ -426,16 +426,6 @@ 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', |