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." am: 5b757feed9

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3f646b3af956f576ef0b243578a3f4f5b402c2fe
This commit is contained in:
Ivan Lozano
2021-01-09 03:58:33 +00:00
committed by Automerger Merge Worker
parent 4b380ac2a9 5b757feed9
commit f2f8c8599f
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]