summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-09 22:33:11 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-09 22:33:11 +0000
commit7c05a4c782a189497bc74584528eecf66b0112de (patch)
treec01ff9391597ae84bef0d0bedf07588cb09bad8e /chrome/test
parent1d9fe33d2c637234652adef834b2f591b6976833 (diff)
downloadchromium_src-7c05a4c782a189497bc74584528eecf66b0112de.zip
chromium_src-7c05a4c782a189497bc74584528eecf66b0112de.tar.gz
chromium_src-7c05a4c782a189497bc74584528eecf66b0112de.tar.bz2
Update test plugins to be fat.
BUG=229514 TEST=ExtensionBrowserTest.Plugin* tests pass in 64 bit Review URL: https://chromiumcodereview.appspot.com/13928020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193245 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/data/extensions/uitest/plugins/README11
1 files changed, 10 insertions, 1 deletions
diff --git a/chrome/test/data/extensions/uitest/plugins/README b/chrome/test/data/extensions/uitest/plugins/README
index 2cd24ef..80dbeb6 100644
--- a/chrome/test/data/extensions/uitest/plugins/README
+++ b/chrome/test/data/extensions/uitest/plugins/README
@@ -6,4 +6,13 @@ npapi_layout_test_plugin with the mime type changed. The build machine is
running 64-bit Hardy with GCC 4.2.4. The binaries have been stripped with
strip --strip-unneeded.
-On Mac, plugin.plugin is a Release build of TestNetscapePlugin.plugin with the MIME type changed.
+On Mac, plugin.plugin is a Release build of TestNetscapePlugin.plugin with the
+MIME type changed. This was built from the tree as of r192827, with manual
+merging of the binaries:
+
+(From both 32 and 64 bit checkouts:)
+$ ninja -C out/Release TestNetscapePlugIn
+(then)
+$ lipo -create [...32...]/src/out/Release/TestNetscapePlugIn.plugin/Contents/MacOS/TestNetscapePlugIn \
+ [...64...]src/out/Release/TestNetscapePlugIn.plugin/Contents/MacOS/TestNetscapePlugIn \
+ -output [somewhere]/TestNetscapePlugIn