Android: Use checked in JDK to run jetify

Bug: 1036426
Change-Id: I86c0dc4e22ae620b0b085b0683f8ccd2c06c3f67
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2066453
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Peter Wen <wnwen@chromium.org>
Auto-Submit: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Peter Wen <wnwen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#743139}

PRESUBMIT.py

@@ -1325,6 +1325,7 @@ _ANDROID_SPECIFIC_PYDEPS_FILES = [
     'build/android/gyp/jacoco_instr.pydeps',
     'build/android/gyp/java_cpp_enum.pydeps',
     'build/android/gyp/java_cpp_strings.pydeps',
+    'build/android/gyp/jetify_jar.pydeps',
     'build/android/gyp/jinja_template.pydeps',
     'build/android/gyp/lint.pydeps',
     'build/android/gyp/main_dex_list.pydeps',

build/android/gyp/jetify_jar.py

@@ -7,9 +7,12 @@
 from __future__ import print_function
 
 import argparse
+import os
 import subprocess
 import sys
 
+from util import build_utils
+
 
 def _AddArguments(parser):
   """Adds arguments related to jetifying to parser.
@@ -50,7 +53,9 @@ def _RunJetifyCommand(parser):
   if args.jetify_config_path:
     cmd.extend(['-c', args.jetify_config_path])
   # Must wait for jetify command to complete to prevent race condition.
-  subprocess.check_call(cmd)
+  env = os.environ.copy()
+  env['JAVA_HOME'] = build_utils.JAVA_HOME
+  subprocess.check_call(cmd, env=env)
 
 
 def main():

build/android/gyp/jetify_jar.pydeps

+# Generated by running:
+#   build/print_python_deps.py --root build/android/gyp --output build/android/gyp/jetify_jar.pydeps build/android/gyp/jetify_jar.py
+../../gn_helpers.py
+jetify_jar.py
+util/__init__.py
+util/build_utils.py

build/config/android/internal_rules.gni

@@ -1579,7 +1579,7 @@ if (enable_java_templates) {
       _jetify_input_jar = _previous_output_jar
       _jetify_output_jar = "$target_out_dir/$target_name-jetified.jar"
 
-      action(_jetify_target) {
+      action_with_pydeps(_jetify_target) {
         script = "//build/android/gyp/jetify_jar.py"
         deps = _deps
         if (defined(invoker.deps)) {