diff options
| author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-15 04:07:11 +0000 |
|---|---|---|
| committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-15 04:07:11 +0000 |
| commit | 76a0b9dd40da48477e87d17d77b8e1941919e342 (patch) | |
| tree | fed6dd912a7244e0068fc76010bd1b724f20d997 /chrome/chrome_installer.gypi | |
| parent | 8e029fd289d74f9a313bb6ff8dbf122a0e360118 (diff) | |
| download | chromium_src-76a0b9dd40da48477e87d17d77b8e1941919e342.zip chromium_src-76a0b9dd40da48477e87d17d77b8e1941919e342.tar.gz chromium_src-76a0b9dd40da48477e87d17d77b8e1941919e342.tar.bz2 | |
More changes to include/use Flapper on Linux ia32 (and remove NPAPI Flash).
NOTRY=true
Review URL: http://codereview.chromium.org/9702030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126833 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_installer.gypi')
| -rw-r--r-- | chrome/chrome_installer.gypi | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/chrome/chrome_installer.gypi b/chrome/chrome_installer.gypi index 3a21826..ad3d1ea 100644 --- a/chrome/chrome_installer.gypi +++ b/chrome/chrome_installer.gypi @@ -438,6 +438,8 @@ '<(PRODUCT_DIR)/locales/en-US.pak', '<(PRODUCT_DIR)/nacl_helper', '<(PRODUCT_DIR)/nacl_helper_bootstrap', + '<(PRODUCT_DIR)/PepperFlash/libpepflashplayer.so', + '<(PRODUCT_DIR)/PepperFlash/manifest.json', '<@(default_apps_list_linux_dest)', ], 'flock_bash': ['flock', '--', '/tmp/linux_package_lock', 'bash'], @@ -451,10 +453,7 @@ ['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', - '<(PRODUCT_DIR)/plugin.vch', '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', ], }], @@ -462,8 +461,6 @@ 'deb_arch': 'amd64', 'rpm_arch': 'x86_64', 'packaging_files_binaries': [ - '<(PRODUCT_DIR)/PepperFlash/libpepflashplayer.so', - '<(PRODUCT_DIR)/PepperFlash/manifest.json', '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', ], }], |