diff options
| -rw-r--r-- | chrome/chrome_exe.gypi | 3 | ||||
| -rw-r--r-- | chrome/chrome_installer.gypi | 5 | ||||
| -rw-r--r-- | chrome/tools/build/linux/FILES.cfg | 16 | ||||
| -rw-r--r-- | chrome/tools/build/win/FILES | 3 | ||||
| -rw-r--r-- | chrome/tools/build/win/FILES.cfg | 6 | ||||
| -rw-r--r-- | third_party/adobe/flash/flash_player.gyp | 16 |
6 files changed, 37 insertions, 12 deletions
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi index bc6d4ca..953b7fe 100644 --- a/chrome/chrome_exe.gypi +++ b/chrome/chrome_exe.gypi @@ -132,7 +132,7 @@ }, 'dependencies': [ 'chrome_version_info', - # Copy a Flash Player binary to PRODUCT_DIR if applicable. + # Copy Flash Player files to PRODUCT_DIR if applicable. # Let the .gyp file decide what to do on a per-OS basis. '../third_party/adobe/flash/flash_player.gyp:flash_player', ], @@ -337,6 +337,7 @@ [ 'branding == "Chrome"', { 'files': [ '<(PRODUCT_DIR)/Flash Player Plugin for Chrome.plugin', + '<(PRODUCT_DIR)/plugin.vch', ], }], ], diff --git a/chrome/chrome_installer.gypi b/chrome/chrome_installer.gypi index 8bd6030..73048ab 100644 --- a/chrome/chrome_installer.gypi +++ b/chrome/chrome_installer.gypi @@ -364,7 +364,10 @@ 'deb_arch': 'i386', 'rpm_arch': 'i386', # Flash Player for Linux is currently only available for ia32. - 'packaging_files_binaries': ['<(PRODUCT_DIR)/libgcflashplayer.so'], + 'packaging_files_binaries': [ + '<(PRODUCT_DIR)/libgcflashplayer.so', + '<(PRODUCT_DIR)/plugin.vch', + ], }], ['target_arch=="x64"', { 'deb_arch': 'amd64', diff --git a/chrome/tools/build/linux/FILES.cfg b/chrome/tools/build/linux/FILES.cfg index 410b562..dc68a0f 100644 --- a/chrome/tools/build/linux/FILES.cfg +++ b/chrome/tools/build/linux/FILES.cfg @@ -56,11 +56,6 @@ FILES = [ 'buildtype': ['dev', 'official'], }, { - 'filename': 'libgcflashplayer.so', - 'arch': ['32bit'], - 'buildtype': ['official'], - }, - { 'filename': 'locales', 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], @@ -85,4 +80,15 @@ FILES = [ 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], }, + # Flash Player files: + { + 'filename': 'libgcflashplayer.so', + 'arch': ['32bit'], + 'buildtype': ['official'], + }, + { + 'filename': 'plugin.vch', + 'arch': ['32bit'], + 'buildtype': ['official'], + }, ] diff --git a/chrome/tools/build/win/FILES b/chrome/tools/build/win/FILES index dccc467..7fef416 100644 --- a/chrome/tools/build/win/FILES +++ b/chrome/tools/build/win/FILES @@ -61,4 +61,5 @@ locales/zh-TW.dll resources rlz.dll wow_helper.exe -gcswf32.dll
\ No newline at end of file +gcswf32.dll +plugin.vch diff --git a/chrome/tools/build/win/FILES.cfg b/chrome/tools/build/win/FILES.cfg index b87d999..e5383b0 100644 --- a/chrome/tools/build/win/FILES.cfg +++ b/chrome/tools/build/win/FILES.cfg @@ -330,9 +330,15 @@ FILES = [ 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], }, + # Flash Player files: { 'filename': 'gcswf32.dll', 'arch': ['32bit', '64bit'], 'buildtype': ['official'], }, + { + 'filename': 'plugin.vch', + 'arch': ['32bit', '64bit'], + 'buildtype': ['official'], + }, ] diff --git a/third_party/adobe/flash/flash_player.gyp b/third_party/adobe/flash/flash_player.gyp index 47646ad..b34a14b 100644 --- a/third_party/adobe/flash/flash_player.gyp +++ b/third_party/adobe/flash/flash_player.gyp @@ -16,14 +16,22 @@ 'files': [], 'conditions': [ [ 'OS == "linux" and target_arch == "ia32"', { - 'files': [ 'binaries/linux/libgcflashplayer.so' ] + 'files': [ + 'binaries/linux/libgcflashplayer.so', + 'binaries/linux/plugin.vch', + ] }], [ 'OS == "mac"', { - 'files': - [ 'binaries/mac/Flash Player Plugin for Chrome.plugin' ] + 'files': [ + 'binaries/mac/Flash Player Plugin for Chrome.plugin', + 'binaries/mac/plugin.vch', + ] }], [ 'OS == "win"', { - 'files': [ 'binaries/win/gcswf32.dll' ] + 'files': [ + 'binaries/win/gcswf32.dll', + 'binaries/win/plugin.vch', + ] }], ], }], |