From 3151ae84efb84163a48b7e7372250bab2371cb5e Mon Sep 17 00:00:00 2001 From: Jeongik Cha Date: Mon, 18 Sep 2023 20:00:58 +0900 Subject: [PATCH] Fix the order of suffix in Android.bp rust_library + host_suffix + rlib_suffix is the right order For example, rust_library_host_dylib, rust_library_host_rlib Bug: 277909042 Test: cargo2android --run --force-rlib Change-Id: Ib156b96853eb51bae1f68229ebe76b87b0f8b363 --- scripts/cargo2android.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/cargo2android.py b/scripts/cargo2android.py index b06223ad6..a0fa65d56 100755 --- a/scripts/cargo2android.py +++ b/scripts/cargo2android.py @@ -828,11 +828,11 @@ class Crate(object): # TODO(chh): should this be rust_library[_host]? # Assuming that Cargo.toml do not use both 'lib' and '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.module_name = altered_name(self.stem) 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.module_name = altered_name(self.stem) elif crate_type == 'dylib': # rust_library[_host]_dylib