summaryrefslogtreecommitdiffstats
path: root/third_party/adobe
diff options
context:
space:
mode:
authorviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-29 19:24:51 +0000
committerviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-29 19:24:51 +0000
commitf7567305826b104269713ab53cb10bbd443cbc5b (patch)
tree9018f89cdbab757b6691380ffef6287889ba57ba /third_party/adobe
parentf6200c4acc22ac6d9b75f365462977e1f26c017e (diff)
downloadchromium_src-f7567305826b104269713ab53cb10bbd443cbc5b.zip
chromium_src-f7567305826b104269713ab53cb10bbd443cbc5b.tar.gz
chromium_src-f7567305826b104269713ab53cb10bbd443cbc5b.tar.bz2
Copy Pepper Flash files into the right place (during build time) for Linux ia32.
This only applies to Chrome-branded builds (and requires that the files be available). More changes will still be needed to actually include the files in distribution packages. This does not (yet) stop the NPAPI binaries from also being copied into PRODUCT_DIR (and put into distribution packages). (The corresponding change for Linux x64 was r122929.) Review URL: http://codereview.chromium.org/9527002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124226 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/adobe')
-rw-r--r--third_party/adobe/flash/flash_player.gyp7
1 files changed, 7 insertions, 0 deletions
diff --git a/third_party/adobe/flash/flash_player.gyp b/third_party/adobe/flash/flash_player.gyp
index 418509d..d6cbf840 100644
--- a/third_party/adobe/flash/flash_player.gyp
+++ b/third_party/adobe/flash/flash_player.gyp
@@ -16,6 +16,13 @@
'binaries/ppapi/linux_x64/manifest.json',
],
}],
+ [ 'OS == "linux" and target_arch == "ia32"', {
+ 'flapper_version_h_file%': 'symbols/ppapi/linux/flapper_version.h',
+ 'flapper_binary_files%': [
+ 'binaries/ppapi/linux/libpepflashplayer.so',
+ 'binaries/ppapi/linux/manifest.json',
+ ],
+ }],
],
}],
],