Bug 1580280 - [lint] Support Python 3 in 'android-lints' integration, r?nalexander draft
authorAndrew Halberstadt <ahalberstadt@mozilla.com>
Mon, 30 Sep 2019 10:24:15 -0400
changeset 2358863 546f44e2f7b7a820577b0360d8339a2310e522d0
parent 2358862 9e634e1593f622c88f60ecec6c7000304928644c
child 2358864 a3663250a630651ea5fc69a828d673e876e698a7
push id429033
push userahalberstadt@mozilla.com
push dateMon, 30 Sep 2019 14:28:02 +0000
treeherdertry@8f341e56b310 [default view] [failures only]
reviewersnalexander
bugs1580280
milestone71.0a1
Bug 1580280 - [lint] Support Python 3 in 'android-lints' integration, r?nalexander Differential Revision: https://phabricator.services.mozilla.com/D45441
tools/lint/android/lints.py
--- a/tools/lint/android/lints.py
+++ b/tools/lint/android/lints.py
@@ -41,17 +41,17 @@ def setup(root, **setupargs):
 
 
 def gradle(log, topsrcdir=None, topobjdir=None, tasks=[], extra_args=[], verbose=True):
     sys.path.insert(0, os.path.join(topsrcdir, 'mobile', 'android'))
     from gradle import gradle_lock
 
     with gradle_lock(topobjdir, max_wait_seconds=GRADLE_LOCK_MAX_WAIT_SECONDS), \
             open(os.devnull, 'wb') as devnull:
-        cmd_args = [sys.executable, os.path.join(topsrcdir, 'mach'),
+        cmd_args = [os.path.join(topsrcdir, 'mach'),
                     'gradle', '--verbose', '--'] + \
             tasks + \
             extra_args
 
         cmd = ' '.join(six.moves.shlex_quote(arg) for arg in cmd_args)
         log.debug(cmd)
 
         # Gradle and mozprocess do not get along well, so we use subprocess