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

Merge "rust: Use rust_ffi for Rust generated C libraries."

Browse Source
This commit is contained in:
Ivan Lozano
2021-01-09 03:31:19 +00:00
committed by Gerrit Code Review
parent 23b36ca799 0c057ade57
commit 5b757feed9
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

@@ -742,11 +742,11 @@ class Crate(object):
self.stem = 'lib' + self.crate_name self.stem = 'lib' + self.crate_name
self.module_name = altered_name(self.stem) + '_dylib' self.module_name = altered_name(self.stem) + '_dylib'
elif crate_type == 'cdylib': # rust_library[_host]_shared elif crate_type == 'cdylib': # rust_library[_host]_shared
self.module_type = 'rust_library' + host + '_shared' self.module_type = 'rust_ffi' + host + '_shared'
self.stem = 'lib' + self.crate_name self.stem = 'lib' + self.crate_name
self.module_name = altered_name(self.stem) + '_shared' self.module_name = altered_name(self.stem) + '_shared'
elif crate_type == 'staticlib': # rust_library[_host]_static elif crate_type == 'staticlib': # rust_library[_host]_static
self.module_type = 'rust_library' + host + '_static' self.module_type = 'rust_ffi' + host + '_static'
self.stem = 'lib' + self.crate_name self.stem = 'lib' + self.crate_name
self.module_name = altered_name(self.stem) + '_static' self.module_name = altered_name(self.stem) + '_static'
elif crate_type == 'test': # rust_test[_host] elif crate_type == 'test': # rust_test[_host]