diff options
| author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-26 22:07:26 +0000 |
|---|---|---|
| committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-26 22:07:26 +0000 |
| commit | 10baea924c51ef80c02d95009cab728b38feb03c (patch) | |
| tree | de5d36d30e8366569c06fd71cfd27e2a07b51fd8 | |
| parent | 0935be38b377b3ea8d4816444333d6f2ce91b22c (diff) | |
| download | chromium_src-10baea924c51ef80c02d95009cab728b38feb03c.zip chromium_src-10baea924c51ef80c02d95009cab728b38feb03c.tar.gz chromium_src-10baea924c51ef80c02d95009cab728b38feb03c.tar.bz2 | |
Linux installer/packager changes for "Cobwerks".
BUG=none
TEST=everything keeps on building properly
Review URL: http://codereview.chromium.org/1471001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42836 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/installer/installer.gyp | 2 | ||||
| -rw-r--r-- | chrome/tools/build/linux/FILES.official | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/chrome/installer/installer.gyp b/chrome/installer/installer.gyp index 67e5c61..9489c462 100644 --- a/chrome/installer/installer.gyp +++ b/chrome/installer/installer.gyp @@ -367,6 +367,8 @@ ['target_arch=="ia32"', { 'deb_arch': 'i386', 'rpm_arch': 'i386', + # Flash Player for Linux is currently only available for ia32. + 'packaging_files_binaries': ['<(PRODUCT_DIR)/libgcflashplayer.so'], }], ['target_arch=="x64"', { 'deb_arch': 'amd64', diff --git a/chrome/tools/build/linux/FILES.official b/chrome/tools/build/linux/FILES.official index 85ab6dc..2d4c7b8 100644 --- a/chrome/tools/build/linux/FILES.official +++ b/chrome/tools/build/linux/FILES.official @@ -5,6 +5,7 @@ chrome_sandbox chrome.1 installer libffmpegsumo.so +libgcflashplayer.so locales product_logo_48.png resources |