From 4542d5fe8bd4fb8824c660caf1077a4c33307dde Mon Sep 17 00:00:00 2001 From: Alexandre Lissy Date: Mon, 28 Oct 2013 11:07:19 +0100 Subject: [PATCH] Bug 931718 - Append 'xulrunner-sdk' to XRE Path With bug 906316 we are now able to have multiple versions of the SDKs on disk, to avoid always re-downloading them. Path has changed, and we need to append 'xulrunner-sdk' so that the binary can be used. --- tools/mach_b2g_bootstrap.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/mach_b2g_bootstrap.py b/tools/mach_b2g_bootstrap.py index 55742a64..3c04c744 100644 --- a/tools/mach_b2g_bootstrap.py +++ b/tools/mach_b2g_bootstrap.py @@ -107,7 +107,7 @@ def _find_xulrunner_sdk(gaia_dir): sdk = sorted(xulrunner_sdks, key=lambda x: int(x[len(x.rstrip('0123456789')):] or 0), reverse=True)[0] - return os.path.join(gaia_dir, sdk) + return os.path.join(gaia_dir, sdk, 'xulrunner-sdk') def bootstrap(b2g_home): # Ensure we are running Python 2.7+. We put this check here so we generate a