commit ad0df0c77cee83afa548fc9f87ba8d2f66873491
author Motomu Utsumi <motomuman@google.com> Fri Jan 27 11:57:33 2023 +0900
committer Motomu Utsumi <motomuman@google.com> Fri Jan 27 11:57:33 2023 +0900
tree 92e0cb4cc2a67c936ce469e924b7887c74d2107e
parent 0a5ba7e979f4f9878710add21c4baba5ec45c031

gn2bp: Fix cronet build for OUT_DIR set

Follow aosp/2394536

Test: ./update_results.sh
Change-Id: I20e3fa9242957c1fc1fc79692e4275f9b52f0fc0

tools/gn2bp/gen_android_bp

diff --git a/tools/gn2bp/gen_android_bp b/tools/gn2bp/gen_android_bp
index 6ae3609..f0dc3f4 100755
--- a/tools/gn2bp/gen_android_bp
+++ b/tools/gn2bp/gen_android_bp
@@ -969,7 +969,7 @@
   def _sanitize_args(self):
     self._set_value_arg('--jar_file', '$(location :current_android_jar)', False)
     if self._has_arg('--jar_file'):
-      self._append_arg('--javap', '$$(find out/.path -name javap)')
+      self._append_arg('--javap', '$$(find $${OUT_DIR:-out}/.path -name javap)')
     self._update_value_arg('--output_dir', self._sanitize_filepath)
     self._update_value_arg('--includes', self._sanitize_filepath, False)
     self._delete_value_arg('--prev_output_dir', False)