summaryrefslogtreecommitdiffstats
path: root/ppapi/native_client/chrome_main.scons
diff options
context:
space:
mode:
authormseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-25 18:48:35 +0000
committermseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-25 18:48:35 +0000
commite3bca80a6c85062e765b2bb86495113f737a865e (patch)
tree32e3326cac9e607e0ead94c16bc9b6ba4ccaf522 /ppapi/native_client/chrome_main.scons
parentbddd3f69e0533c7d51f1bf041434053e2a56913e (diff)
downloadchromium_src-e3bca80a6c85062e765b2bb86495113f737a865e.zip
chromium_src-e3bca80a6c85062e765b2bb86495113f737a865e.tar.gz
chromium_src-e3bca80a6c85062e765b2bb86495113f737a865e.tar.bz2
PNaCl: Remove Scons builds of the PPAPI shims and PNaCl translator extension
These aren't used any more. We don't run PNaCl tests in the Scons-based nacl_integration step. Also, the NaCl SDK build gets the PPAPI shims from the Gyp build. BUG=none TEST=trybots Review URL: https://codereview.chromium.org/20103005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213666 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/native_client/chrome_main.scons')
-rw-r--r--ppapi/native_client/chrome_main.scons30
1 files changed, 0 insertions, 30 deletions
diff --git a/ppapi/native_client/chrome_main.scons b/ppapi/native_client/chrome_main.scons
index 047fdf0..d36bc76 100644
--- a/ppapi/native_client/chrome_main.scons
+++ b/ppapi/native_client/chrome_main.scons
@@ -62,8 +62,6 @@ ppapi_scons_files['untrusted_scons_files'] = [
'src/shared/ppapi/nacl.scons',
'src/untrusted/irt_stub/nacl.scons',
'src/untrusted/nacl_ppapi_util/nacl.scons',
- 'src/untrusted/pnacl_irt_shim/nacl.scons',
- 'src/untrusted/pnacl_support_extension/nacl.scons',
]
@@ -396,31 +394,6 @@ def GeneratedManifestNode(env, manifest):
return result
-def GetPnaclExtensionRootNode(env):
- """Get the scons node representing the root directory of pnacl support files.
- """
- # This is "built" by src/untrusted/pnacl_support_extension/nacl.scons.
- return env.Dir('${DESTINATION_ROOT}/pnacl_support')
-
-pre_base_env.AddMethod(GetPnaclExtensionRootNode)
-
-def GetPnaclExtensionDummyVersion(env):
- """ We supply a dummy version number when packaging the test-extension
- that is probably newer than all other versions. """
- return '9999.9.9.9'
-
-pre_base_env.AddMethod(GetPnaclExtensionDummyVersion)
-
-def GetPnaclExtensionNode(env):
- """Get the scons node representing a specific version of pnacl support files.
- """
- # This is "built" by src/untrusted/pnacl_support_extension/nacl.scons.
- return env.Dir('${DESTINATION_ROOT}/pnacl_support/' +
- env.GetPnaclExtensionDummyVersion())
-
-pre_base_env.AddMethod(GetPnaclExtensionNode)
-
-
# Compares output_file and golden_file.
# If they are different, prints the difference and returns 1.
# Otherwise, returns 0.
@@ -601,9 +574,6 @@ def PPAPIBrowserTester(env,
size='huge',
capture_output=capture_output,
**extra)
- # Also indicate that we depend on the layed-out pnacl translator.
- if env.Bit('bitcode'):
- env.Depends(node, env.GetPnaclExtensionNode())
for side_effect in side_effects:
env.SideEffect(side_effect, node)
# We can't check output if the test is not run.