commit d89e8bf7366edcbd3544bb008f13d9297866149f
author Patrick Rohr <prohr@google.com> Mon Oct 31 14:51:05 2022 -0700
committer Patrick Rohr <prohr@google.com> Mon Oct 31 14:51:53 2022 -0700
tree de54bb88ea648c4439c175b252047df074cdda51
parent 9806515c136c717b3b84ca853d9f6ee33c9784ef

gn2bp: fix jni_generator --includes

Test: //base:base
Change-Id: I66c34ac0fd9384f0430ab98c7d21541eeaaf4f71

tools/gn2bp/gen_android_bp

diff --git a/tools/gn2bp/gen_android_bp b/tools/gn2bp/gen_android_bp
index 2da4142..61cd964 100755
--- a/tools/gn2bp/gen_android_bp
+++ b/tools/gn2bp/gen_android_bp
@@ -701,6 +701,9 @@
         # TODO: put inside function
         filename = re.sub('^\.\./\.\./', '', target.args[i + 1])
         target.args[i + 1] = '$(location %s)' % filename
+      if val == '--includes' and 'jni_generator_helper' in target.args[i + 1]:
+        # delete all leading ../
+        target.args[i + 1] = re.sub('^(\.\./)+', '', target.args[i + 1])
     # fix target.output directory to match #include statements.
     target.outputs = [re.sub('^jni_headers/', '', out) for out in target.outputs]