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

Merge "Fix the order of suffix in Android.bp" into main

Browse Source
This commit is contained in:
Treehugger Robot
2023-09-18 21:44:36 +00:00
committed by Gerrit Code Review
parent aa683c3fa8 3151ae84ef
commit 09de1731fd
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/cargo2android.py
View File

@@ -828,11 +828,11 @@ class Crate(object):
# TODO(chh): should this be rust_library[_host]? # TODO(chh): should this be rust_library[_host]?
# Assuming that Cargo.toml do not use both 'lib' and 'rlib', # Assuming that Cargo.toml do not use both 'lib' and 'rlib',
# because we map them both to rlib. # because we map them both to rlib.
self.module_type = 'rust_library' + rlib + host self.module_type = 'rust_library' + host + rlib
self.stem = 'lib' + self.crate_name + suffix + self.runner.args.name_suffix self.stem = 'lib' + self.crate_name + suffix + self.runner.args.name_suffix
self.module_name = altered_name(self.stem) self.module_name = altered_name(self.stem)
elif crate_type == 'rlib': # rust_library[_host] elif crate_type == 'rlib': # rust_library[_host]
self.module_type = 'rust_library' + rlib + host self.module_type = 'rust_library' + host + rlib
self.stem = 'lib' + self.crate_name + suffix + self.runner.args.name_suffix self.stem = 'lib' + self.crate_name + suffix + self.runner.args.name_suffix
self.module_name = altered_name(self.stem) self.module_name = altered_name(self.stem)
elif crate_type == 'dylib': # rust_library[_host]_dylib elif crate_type == 'dylib': # rust_library[_host]_dylib