gn2bp: move jni_generator.py --jar_file to sanitizer
Test: none
Change-Id: I2a602a3b11304c3c4c8fe551890c7c16c73455bf
diff --git a/tools/gn2bp/gen_android_bp b/tools/gn2bp/gen_android_bp
index 28513fa..17481c2 100755
--- a/tools/gn2bp/gen_android_bp
+++ b/tools/gn2bp/gen_android_bp
@@ -684,7 +684,7 @@
self.target.args.append(value)
# wrap filename in location tag.
- def _location_tag(self, filename):
+ def _add_location_tag(self, filename):
return '$(location %s)' % filename
# applies common directory transformation that *should* be universally applicable.
@@ -712,6 +712,8 @@
class JniGeneratorSanitizer(BaseActionSanitizer):
def get_args(self):
+ self._update_value_arg('--jar_file', self._sanitize_dir)
+ self._update_value_arg('--jar_file', self._add_location_tag)
if self._has_arg('--jar_file'):
self._append_arg('--javap', '$$(find out/.path -name javap)')
self._update_value_arg('--output_dir', self._sanitize_dir)
@@ -782,10 +784,6 @@
# TODO: put inside function
filename = re.sub('^\.\./\.\./', '', target.args[i + 1])
target.args[i + 1] = '$(location %s)' % filename
- elif val == '--jar_file':
- # delete leading ../../ and add path to javap
- filename = re.sub('^\.\./\.\./', '', target.args[i + 1])
- target.args[i + 1] = '$(location %s)' % filename
# fix target.output directory to match #include statements.
target.outputs = [re.sub('^jni_headers/', '', out) for out in target.outputs]