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" am: f78de4f942 am: 9bbb76e144 am: 3497b061cc

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/development/+/1838728

Change-Id: I317342f66ebab949158f9d8480f57eacfa5c786d
This commit is contained in:
Joel Galenson
2021-10-08 21:57:38 +00:00
committed by Automerger Merge Worker
parent b32aa079e4 3497b061cc
commit 647214b144
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/cargo2android.py
View File

@@ -648,6 +648,7 @@ class Crate(object):
self.dump_srcs_list() self.dump_srcs_list()
if self.cargo_env_compat: if self.cargo_env_compat:
self.write(' cargo_env_compat: true,') self.write(' cargo_env_compat: true,')
if not self.runner.args.no_pkg_vers:
self.write(' cargo_pkg_version: "' + self.cargo_pkg_version + '",') self.write(' cargo_pkg_version: "' + self.cargo_pkg_version + '",')
if 'test' in self.crate_types: if 'test' in self.crate_types:
self.write(' test_suites: ["general-tests"],') self.write(' test_suites: ["general-tests"],')
@@ -883,6 +884,7 @@ class Crate(object):
self.write(' crate_name: "' + self.crate_name + '",') self.write(' crate_name: "' + self.crate_name + '",')
if not self.defaults and self.cargo_env_compat: if not self.defaults and self.cargo_env_compat:
self.write(' cargo_env_compat: true,') self.write(' cargo_env_compat: true,')
if not self.runner.args.no_pkg_vers:
self.write(' cargo_pkg_version: "' + self.cargo_pkg_version + '",') self.write(' cargo_pkg_version: "' + self.cargo_pkg_version + '",')
if not self.default_srcs: if not self.default_srcs:
self.dump_srcs_list() self.dump_srcs_list()