gn2bp: Fix cronet build for OUT_DIR set
Follow aosp/2394536
Test: ./update_results.sh
Change-Id: I20e3fa9242957c1fc1fc79692e4275f9b52f0fc0
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: [
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)