From 94b8a8d40cd9991c60e978bb110bc24aa4bff631 Mon Sep 17 00:00:00 2001 From: Joel Galenson Date: Tue, 28 Sep 2021 11:53:51 -0700 Subject: [PATCH] Do not generate cargo_pkg_version when --no-pkg-vers is passed If you passed --no-pkg-vers to cargo2android.py, it would still generate cargo_pkg_version with an empty string. Instead, simply don't generate anything. Test: Use with and without argument. Change-Id: I544e4789312ccc3481da73c78f0f2cae2ad6619c --- scripts/cargo2android.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/cargo2android.py b/scripts/cargo2android.py index c0db53883..937d77754 100755 --- a/scripts/cargo2android.py +++ b/scripts/cargo2android.py @@ -648,7 +648,8 @@ class Crate(object): self.dump_srcs_list() if self.cargo_env_compat: self.write(' cargo_env_compat: true,') - self.write(' cargo_pkg_version: "' + self.cargo_pkg_version + '",') + if not self.runner.args.no_pkg_vers: + self.write(' cargo_pkg_version: "' + self.cargo_pkg_version + '",') if 'test' in self.crate_types: self.write(' test_suites: ["general-tests"],') self.write(' auto_gen_config: true,') @@ -883,7 +884,8 @@ class Crate(object): self.write(' crate_name: "' + self.crate_name + '",') if not self.defaults and self.cargo_env_compat: self.write(' cargo_env_compat: true,') - self.write(' cargo_pkg_version: "' + self.cargo_pkg_version + '",') + if not self.runner.args.no_pkg_vers: + self.write(' cargo_pkg_version: "' + self.cargo_pkg_version + '",') if not self.default_srcs: self.dump_srcs_list() if 'test' in self.crate_types and not self.defaults: