Commit d49778db authored by Andrew Grieve's avatar Andrew Grieve Committed by Commit Bot

Android: Use checked in JDK to run Jetify (part 2)

5853fbdc did this for .jar files. This
CL addresses compile_resources.py.

Bug: 1036426
Change-Id: I991132f4b2b1bc99002ec2a153d35ab815bd84b8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2070370
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Peter Wen <wnwen@chromium.org>
Auto-Submit: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: default avatarPeter Wen <wnwen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#743978}
parent c67ad4f4
...@@ -556,7 +556,9 @@ def _JetifyArchive(dep_path, output_path): ...@@ -556,7 +556,9 @@ def _JetifyArchive(dep_path, output_path):
_JETIFY_SCRIPT_PATH, '-i', temp_archive.name, '-o', temp_archive.name, _JETIFY_SCRIPT_PATH, '-i', temp_archive.name, '-o', temp_archive.name,
'-l', 'error' '-l', 'error'
] ]
subprocess.check_call(jetify_cmd) env = os.environ.copy()
env['JAVA_HOME'] = build_utils.JAVA_HOME
subprocess.check_call(jetify_cmd, env=env)
with zipfile.ZipFile(temp_archive.name) as zf: with zipfile.ZipFile(temp_archive.name) as zf:
zf.extractall(output_path) zf.extractall(output_path)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment