Blob Blame History Raw
diff -up chromium-67.0.3396.99/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py.py2 chromium-67.0.3396.99/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py
--- chromium-67.0.3396.99/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py.py2	2018-07-25 14:14:02.004886479 -0400
+++ chromium-67.0.3396.99/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py	2018-07-25 14:15:30.167896461 -0400
@@ -58,7 +58,7 @@ def _MinifyJS(input_js):
 
   with tempfile.NamedTemporaryFile() as _:
     args = [
-        'python',
+        'python2',
         rjsmin_path
     ]
     p = subprocess.Popen(args,
@@ -177,7 +177,7 @@ def _MinifyCSS(css_text):
       os.path.join(py_vulcanize_path, 'third_party', 'rcssmin', 'rcssmin.py'))
 
   with tempfile.NamedTemporaryFile() as _:
-    rcssmin_args = ['python', rcssmin_path]
+    rcssmin_args = ['python2', rcssmin_path]
     p = subprocess.Popen(rcssmin_args,
                          stdin=subprocess.PIPE,
                          stdout=subprocess.PIPE,
diff -up chromium-67.0.3396.99/tools/gn/bootstrap/bootstrap.py.py2 chromium-67.0.3396.99/tools/gn/bootstrap/bootstrap.py
--- chromium-67.0.3396.99/tools/gn/bootstrap/bootstrap.py.py2	2018-07-24 16:58:53.372022183 -0400
+++ chromium-67.0.3396.99/tools/gn/bootstrap/bootstrap.py	2018-07-24 17:00:03.200279816 -0400
@@ -983,7 +983,7 @@ def build_gn_with_gn(temp_gn, build_dir,
   gn_gen_args = options.gn_gen_args or ''
   if not options.debug:
     gn_gen_args += ' is_debug=false'
-  cmd = [temp_gn, 'gen', build_dir, '--args=%s' % gn_gen_args,
+  cmd = [temp_gn, 'gen', '--script-executable=/usr/bin/python2', build_dir, '--args=%s' % gn_gen_args,
           "--root="+SRC_ROOT
          ]
   check_call(cmd)
@@ -997,7 +997,7 @@ def build_gn_with_gn(temp_gn, build_dir,
   # build.ninja currently refers back to gn from the temporary directory.
   # Regenerate the build files using the gn we just built so that the reference
   # gets updated to "./gn".
-  cmd = [os.path.join(build_dir, 'gn'), 'gen', build_dir,
+  cmd = [os.path.join(build_dir, 'gn'), 'gen', '--script-executable=/usr/bin/python2', build_dir,
          '--args=%s' % gn_gen_args]
   check_call(cmd)