summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthaloun@google.com <thaloun@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-03 22:19:44 +0000
committerthaloun@google.com <thaloun@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-03 22:19:44 +0000
commit1700a99ad3fed428265e550b79ac333aad8f76ad (patch)
treeae29c5b553c0ac9ef81391e172386814e89b7220
parent5cad70a8b935ff6dd33fc311f470f54470527cb7 (diff)
downloadchromium_src-1700a99ad3fed428265e550b79ac333aad8f76ad.zip
chromium_src-1700a99ad3fed428265e550b79ac333aad8f76ad.tar.gz
chromium_src-1700a99ad3fed428265e550b79ac333aad8f76ad.tar.bz2
Second try at adding conditional for fixing mac gtv-o3d targets.
BUG="" TESTED= Review URL: http://codereview.chromium.org/3326012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58552 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--o3d/tests/selenium/selenium.gyp7
1 files changed, 5 insertions, 2 deletions
diff --git a/o3d/tests/selenium/selenium.gyp b/o3d/tests/selenium/selenium.gyp
index fd5b4e1..15576b58 100644
--- a/o3d/tests/selenium/selenium.gyp
+++ b/o3d/tests/selenium/selenium.gyp
@@ -179,11 +179,14 @@
'dependencies': [
'../../plugin/plugin.gyp:npo3dautoplugin',
],
+ 'variables': {
+ 'plugin_npapi_filename%': 'O3D',
+ },
'actions': [
{
'action_name': 'unpack_firefox',
'inputs': [
- '<(PRODUCT_DIR)/O3D.plugin',
+ '<(PRODUCT_DIR)/<(plugin_npapi_filename).plugin',
],
'outputs': [
'<(PRODUCT_DIR)/selenium_firefox',
@@ -191,7 +194,7 @@
'action': [
'python',
'unpack_firefox.py',
- '--plugin_path=<(PRODUCT_DIR)/O3D.plugin',
+ '--plugin_path=<(PRODUCT_DIR)/<(plugin_npapi_filename).plugin',
'--product_path=<(PRODUCT_DIR)',
],
},