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

rust: Use rust_ffi for Rust generated C libraries.

Browse Source 
We no longer have the rust_library_shared and rust_library_static module
types. They've been renamed to rust_ffi_* instead. This brings
cargo2android.py up to date.

Bug: 175155132
Test: cargo2android's Android.bp for libquiche contains rust_ffi modules
Change-Id: I01bb8b4e56c41d36481ffd363f96aecb770d7cb8
This commit is contained in:
Ivan Lozano
2020-12-15 10:41:26 -05:00
parent 223d9273bb
commit 0c057ade57
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]