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

Merge changes Icdf88bc3,I368e905a am: d3675725b8 am: d354d0a15b am: c7b2dbbfc5

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

Change-Id: I4d8d68105abf29b7869ad752243a93caba02bd21
This commit is contained in:
Joel Galenson
2021-08-17 00:51:55 +00:00
committed by Automerger Merge Worker
parent 3e4a17e547 c7b2dbbfc5
commit c0fa97d55c
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/cargo2android.py
View File

@@ -456,7 +456,7 @@ class Crate(object):
self.root_pkg = self.crate_name self.root_pkg = self.crate_name
# get the package version from running cargo metadata # get the package version from running cargo metadata
if not self.runner.args.no_pkg_vers: if not self.runner.args.no_pkg_vers and not self.skip_crate():
self.get_pkg_version() self.get_pkg_version()
self.device_supported = self.runner.args.device self.device_supported = self.runner.args.device
@@ -483,8 +483,10 @@ class Crate(object):
and where the package name does not match the emitted crate_name and where the package name does not match the emitted crate_name
(e.g. [lib.name] is set). (e.g. [lib.name] is set).
""" """
cargo_metadata = subprocess.run(['cargo', 'metadata', '--no-deps'], cargo_metadata = subprocess.run([self.runner.cargo_path, 'metadata', '--no-deps',
cwd=os.path.abspath(self.cargo_dir), capture_output=True) '--format-version', '1'],
cwd=os.path.abspath(self.cargo_dir),
stdout=subprocess.PIPE)
if cargo_metadata.returncode: if cargo_metadata.returncode:
self.errors += ('ERROR: unable to get cargo metadata for package version; ' + self.errors += ('ERROR: unable to get cargo metadata for package version; ' +
'return code ' + cargo_metadata.returncode + '\n') 'return code ' + cargo_metadata.returncode + '\n')