gn2bp: Support write_native_libraries_java.py
Test: m cronet_aml_build_android_native_libraries_gen
Change-Id: I60dc7a01003ef4dda0acf3ce38941b644d14592e
diff --git a/tools/gn2bp/Android.bp.swp b/tools/gn2bp/Android.bp.swp
index 0b5695e..b1c88c9 100644
--- a/tools/gn2bp/Android.bp.swp
+++ b/tools/gn2bp/Android.bp.swp
@@ -2866,7 +2866,7 @@
genrule {
name: "cronet_aml_build_android_native_libraries_gen",
cmd: "$(location build/android/gyp/write_native_libraries_java.py) --output " +
- "gen/build/android/native_libraries_gen.srcjar " +
+ "$(out) " +
"--cpu-family " +
"CPU_FAMILY_X86",
out: [
diff --git a/tools/gn2bp/gen_android_bp b/tools/gn2bp/gen_android_bp
index 5fda3ef..b2d20ab 100755
--- a/tools/gn2bp/gen_android_bp
+++ b/tools/gn2bp/gen_android_bp
@@ -808,6 +808,10 @@
# wrap filename in \"$(location filename)\"
args = ['$(location %s)' % arg for arg in args]
target.args[i + 1] = '[%s]' % ', '.join(args)
+ elif target.script == "//build/android/gyp/write_native_libraries_java.py":
+ for i, val in enumerate(target.args):
+ if val == '--output':
+ target.args[i + 1] = '$(out)'
script = gn_utils.label_to_path(target.script)
module.tool_files.add(script)