LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Do not generate cargo_pkg_version when --no-pkg-vers is passed"

Browse Source
This commit is contained in:
Joel Galenson
2021-10-08 21:12:41 +00:00
committed by Gerrit Code Review
parent 30bf9e8463 94b8a8d40c
commit f78de4f942
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/cargo2android.py
View File

@@ -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: