diff options
| author | tschmelcher@chromium.org <tschmelcher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-15 17:27:10 +0000 |
|---|---|---|
| committer | tschmelcher@chromium.org <tschmelcher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-15 17:27:10 +0000 |
| commit | 485392bfbc7a311782c2663b02f28a64f1bcc4be (patch) | |
| tree | a3c656a7bad8cf3b0f6b331743bfce714604f780 /o3d/tests | |
| parent | 3b9b49aec5d9812c9d4884328f6e6c3972a2c416 (diff) | |
| download | chromium_src-485392bfbc7a311782c2663b02f28a64f1bcc4be.zip chromium_src-485392bfbc7a311782c2663b02f28a64f1bcc4be.tar.gz chromium_src-485392bfbc7a311782c2663b02f28a64f1bcc4be.tar.bz2 | |
Mac: Use the plugin_npapi_filename variable to choose the bundle name (rather than the static "O3D" name) so that differently branded versions can co-exist. This also changes the default name from O3D.plugin to npo3dautoplugin.plugin to harmonize it with the other platforms.
TEST=built & tested a rebranded plugin and non-rebranded plugin on Mac
BUG=none
Review URL: http://codereview.chromium.org/1585034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44662 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/tests')
| -rw-r--r-- | o3d/tests/build.scons | 2 | ||||
| -rw-r--r-- | o3d/tests/lab/runner_constants.py | 2 | ||||
| -rw-r--r-- | o3d/tests/selenium/selenium.gyp | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/o3d/tests/build.scons b/o3d/tests/build.scons index 7d20e6c..29125c0 100644 --- a/o3d/tests/build.scons +++ b/o3d/tests/build.scons @@ -546,7 +546,7 @@ cleanup_steps = [] selenium_good_to_go = True if run_env.Bit('mac'): - plugin_path = '$ARTIFACTS_DIR/O3D.plugin' + plugin_path = '$ARTIFACTS_DIR/npo3dautoplugin.plugin' if run_env['MAC_HERMETIC_FIREFOX_DIR']: # if we have a hermetic version of Firefox, then run it diff --git a/o3d/tests/lab/runner_constants.py b/o3d/tests/lab/runner_constants.py index 33afbe5..ff6a09e 100644 --- a/o3d/tests/lab/runner_constants.py +++ b/o3d/tests/lab/runner_constants.py @@ -92,7 +92,7 @@ if util.IsWindows(): INSTALL_PATHS += [join(HOME, 'Application Data', 'Google', 'O3D', 'o3d_host.dll')] elif util.IsMac(): - INSTALL_PATHS += ['/Library/Internet Plug-Ins/O3D.plugin'] + INSTALL_PATHS += ['/Library/Internet Plug-Ins/npo3dautoplugin.plugin'] else: INSTALL_PATHS += [join(HOME, '.mozilla', 'plugins', 'libnpo3dautoplugin.so')] diff --git a/o3d/tests/selenium/selenium.gyp b/o3d/tests/selenium/selenium.gyp index fd5b4e1..9820a13 100644 --- a/o3d/tests/selenium/selenium.gyp +++ b/o3d/tests/selenium/selenium.gyp @@ -16,6 +16,7 @@ }, 'includes': [ '../../build/common.gypi', + '../../plugin/branding.gypi', ], 'targets': [ { @@ -183,7 +184,7 @@ { 'action_name': 'unpack_firefox', 'inputs': [ - '<(PRODUCT_DIR)/O3D.plugin', + '<(PRODUCT_DIR)/<(plugin_npapi_filename).plugin', ], 'outputs': [ '<(PRODUCT_DIR)/selenium_firefox', @@ -191,7 +192,7 @@ 'action': [ 'python', 'unpack_firefox.py', - '--plugin_path=<(PRODUCT_DIR)/O3D.plugin', + '--plugin_path=<(PRODUCT_DIR)/<(plugin_npapi_filename).plugin', '--product_path=<(PRODUCT_DIR)', ], }, |