commit aeabeb97410892eb63a2ef9598914a09f05ae3d2
author Motomu Utsumi <motomuman@google.com> Fri Jan 27 13:14:43 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jan 27 13:14:43 2023 +0000
tree 987de54493e709e1adbe217000c99e12a468d39a
parent 9b18126984861083a986b02f92ae1f7a4b7e83f5
parent ad0df0c77cee83afa548fc9f87ba8d2f66873491

gn2bp: Fix cronet build for OUT_DIR set am: ad0df0c77c

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2401045

Change-Id: I1ead36f90cc4aeab48b84fbb84d5c6baa92ee659
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

tools/gn2bp/Android.bp.swp

diff --git a/tools/gn2bp/Android.bp.swp b/tools/gn2bp/Android.bp.swp
index c881767..9f4ac7c 100644
--- a/tools/gn2bp/Android.bp.swp
+++ b/tools/gn2bp/Android.bp.swp
@@ -381,7 +381,7 @@
          "--input_file " +
          "java/lang/Runtime.class " +
          "--javap " +
-         "$$(find out/.path -name javap) " +
+         "$$(find $${OUT_DIR:-out}/.path -name javap) " +
          "--package_prefix " +
          "android.net.http.internal",
     out: [

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)