Bug 1527796 - Part 1. Add python.exe path to call mach shell script from python. r=nalexander
authorMakoto Kato <m_kato@ga2.so-net.ne.jp>
Tue, 12 Feb 2019 14:45:36 +0900
changeset 466815 c95084270844448e1c44d9e32ed2ea3a0a16848f
parent 466814 7404e19d25344119de65db17748b3874bc8a19f1
child 466816 440350958e77ea77422d48538416a113c1e3d888
push id35781
push useropoprus@mozilla.com
push dateFri, 29 Mar 2019 21:56:26 +0000
treeherdermozilla-central@4526b65c502e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander
bugs1527796
milestone68.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1527796 - Part 1. Add python.exe path to call mach shell script from python. r=nalexander Since Windows doesn't call mach command from MSYS shell, we need python path to call mach. Differential Revision: https://phabricator.services.mozilla.com/D20448
mobile/android/gradle.py
--- a/mobile/android/gradle.py
+++ b/mobile/android/gradle.py
@@ -1,16 +1,17 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from __future__ import print_function
 
 import buildconfig
 import subprocess
+import sys
 
 from mozbuild.util import (
     ensureParentDir,
     lock_file,
 )
 import mozpack.path as mozpath
 
 
@@ -18,16 +19,17 @@ def android(verb, *args):
     # Building the same Gradle root project with multiple concurrent processes
     # is not well supported, so we use a simple lock file to serialize build
     # steps.
     lock_path = '{}/gradle/mach_android.lockfile'.format(buildconfig.topobjdir)
     ensureParentDir(lock_path)
     lock_instance = lock_file(lock_path)
     try:
         cmd = [
+            sys.executable,
             mozpath.join(buildconfig.topsrcdir, 'mach'),
             'android',
             verb,
         ]
         cmd.extend(args)
         subprocess.check_call(cmd)
 
         return 0