diff options
author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-30 21:44:35 +0000 |
---|---|---|
committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-30 21:44:35 +0000 |
commit | 636dc35b9c6e868ca62afd94fb0e9fae858c38f7 (patch) | |
tree | 861124f1a22dba12e01996e92745771cac0538c0 | |
parent | 41b83df7c0f90f62f33a59a882d20bc519750d5b (diff) | |
download | chromium_src-636dc35b9c6e868ca62afd94fb0e9fae858c38f7.zip chromium_src-636dc35b9c6e868ca62afd94fb0e9fae858c38f7.tar.gz chromium_src-636dc35b9c6e868ca62afd94fb0e9fae858c38f7.tar.bz2 |
Remove Flapper (PPAPI Flash) from 1180_57, "just in case".
Note that NPAPI Flash was STILL being bundled!!?!??!?!?!
Review URL: http://codereview.chromium.org/10836014
git-svn-id: svn://svn.chromium.org/chrome/branches/1180_57/src@149035 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | chrome/installer/mini_installer/chrome.release | 2 | ||||
-rw-r--r-- | chrome/tools/build/win/FILES.cfg | 10 | ||||
-rw-r--r-- | third_party/adobe/flash/flash_player.gyp | 7 |
3 files changed, 0 insertions, 19 deletions
diff --git a/chrome/installer/mini_installer/chrome.release b/chrome/installer/mini_installer/chrome.release index 31204a5..7efafbb 100644 --- a/chrome/installer/mini_installer/chrome.release +++ b/chrome/installer/mini_installer/chrome.release @@ -45,8 +45,6 @@ delegate_execute.exe: %(VersionDir)s\ gcswf32.dll: %(VersionDir)s\ metro_driver.dll: %(VersionDir)s\ plugin.vch: %(VersionDir)s\ -PepperFlash\pepflashplayer.dll: %(VersionDir)s\PepperFlash\ -PepperFlash\manifest.json: %(VersionDir)s\PepperFlash\ # All or none of the following 3 files need to be present as the creation of # VisualElementsManifest.xml is based on the existence of # %(VersionDir)\VisualElements. On a similar note, no other files should be diff --git a/chrome/tools/build/win/FILES.cfg b/chrome/tools/build/win/FILES.cfg index 4ebd6e1..29bb855 100644 --- a/chrome/tools/build/win/FILES.cfg +++ b/chrome/tools/build/win/FILES.cfg @@ -398,16 +398,6 @@ FILES = [ 'arch': ['32bit', '64bit'], 'buildtype': ['official'], }, - { - 'filename': 'PepperFlash/pepflashplayer.dll', - 'arch': ['32bit', '64bit'], - 'buildtype': ['official'], - }, - { - 'filename': 'PepperFlash/manifest.json', - 'arch': ['32bit', '64bit'], - 'buildtype': ['official'], - }, # PDF Plugin files: { 'filename': 'pdf.dll', diff --git a/third_party/adobe/flash/flash_player.gyp b/third_party/adobe/flash/flash_player.gyp index 3dec8a1..ca02bcd 100644 --- a/third_party/adobe/flash/flash_player.gyp +++ b/third_party/adobe/flash/flash_player.gyp @@ -23,13 +23,6 @@ 'binaries/ppapi/linux_x64/manifest.json', ], }], - [ 'OS == "win"', { - 'flapper_version_h_file%': 'symbols/ppapi/win/flapper_version.h', - 'flapper_binary_files%': [ - 'binaries/ppapi/win/pepflashplayer.dll', - 'binaries/ppapi/win/manifest.json', - ], - }], ], }], ], |