gn2bp: fix jni_generator --includes
Test: //base:base
Change-Id: I66c34ac0fd9384f0430ab98c7d21541eeaaf4f71
diff --git a/tools/gn2bp/Android.bp.swp b/tools/gn2bp/Android.bp.swp
index da917e9..87afdc4 100644
--- a/tools/gn2bp/Android.bp.swp
+++ b/tools/gn2bp/Android.bp.swp
@@ -270,7 +270,7 @@
"--output_dir " +
"$(genDir)/base/android_runtime_jni_headers " +
"--includes " +
- "../../../../../../base/android/jni_generator/jni_generator_helper.h " +
+ "base/android/jni_generator/jni_generator_helper.h " +
"--jar_file " +
"../../third_party/android_sdk/public/platforms/android-33/android.jar " +
"--output_name " +
@@ -1022,7 +1022,7 @@
"--output_dir " +
"$(genDir)/base/base_jni_headers " +
"--includes " +
- "../../../../../../base/android/jni_generator/jni_generator_helper.h " +
+ "base/android/jni_generator/jni_generator_helper.h " +
"--use_proxy_hash " +
"--output_name " +
"ApkAssets_jni.h " +
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]