gn2bp: clean up argument parsing
Test: //base:base
Change-Id: I3f2e1444f79b4a5ae4a3ac6a9c0f39206fbe82eb
diff --git a/tools/gn2bp/gen_android_bp b/tools/gn2bp/gen_android_bp
index 5ff30de..27f69d2 100755
--- a/tools/gn2bp/gen_android_bp
+++ b/tools/gn2bp/gen_android_bp
@@ -697,7 +697,7 @@
if val == '--output_dir':
# replace --output_dir gen/jni_headers/... with --output_dir $(genDir)/...
target.args[i + 1] = re.sub('^gen/jni_headers', '$(genDir)', target.args[i + 1])
- if val == '--input_file':
+ elif val == '--input_file':
# --input_file supports both .class specifiers or source files as arguments.
# Only source files need to be wrapped inside a $(location <label>) tag.
if re.match('.*\.class$', target.args[i + 1]):
@@ -706,14 +706,14 @@
# 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]:
+ elif val == '--includes' and 'jni_generator_helper' in target.args[i + 1]:
# delete all leading ../
target.args[i + 1] = re.sub('^(\.\./)+', '', target.args[i + 1])
- if val == '--prev_output_dir':
+ elif val == '--prev_output_dir':
# this is not needed for aosp builds.
target.args[i] = ''
target.args[i + 1] = ''
- if val == '--jar_file':
+ 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