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