@@ -510,7 +510,10 @@ impl InstallTargetPaths {
510
510
}
511
511
}
512
512
513
- fn load_manifest_capi_config ( pkg : & Package ) -> anyhow:: Result < CApiConfig > {
513
+ fn load_manifest_capi_config (
514
+ pkg : & Package ,
515
+ rustc_target : & target:: Target ,
516
+ ) -> anyhow:: Result < CApiConfig > {
514
517
let name = & pkg
515
518
. manifest ( )
516
519
. targets ( )
@@ -690,6 +693,10 @@ fn load_manifest_capi_config(pkg: &Package) -> anyhow::Result<CApiConfig> {
690
693
}
691
694
}
692
695
696
+ if rustc_target. os == "android" {
697
+ versioning = false ;
698
+ }
699
+
693
700
let library = LibraryCApiConfig {
694
701
name : lib_name,
695
702
version,
@@ -920,7 +927,7 @@ fn compile_with_exec(
920
927
921
928
for unit in bcx. roots . iter ( ) {
922
929
let pkg = & unit. pkg ;
923
- let capi_config = load_manifest_capi_config ( pkg) ?;
930
+ let capi_config = load_manifest_capi_config ( pkg, rustc_target ) ?;
924
931
let name = & capi_config. library . name ;
925
932
let install_paths = InstallPaths :: new ( name, args, & capi_config) ;
926
933
let pkg_rustflags = & capi_config. library . rustflags ;
@@ -1007,7 +1014,7 @@ impl CPackage {
1007
1014
let id = pkg. package_id ( ) ;
1008
1015
let version = pkg. version ( ) . clone ( ) ;
1009
1016
let root_path = pkg. root ( ) . to_path_buf ( ) ;
1010
- let capi_config = load_manifest_capi_config ( pkg) ?;
1017
+ let capi_config = load_manifest_capi_config ( pkg, rustc_target ) ?;
1011
1018
1012
1019
patch_target ( pkg, libkinds, & capi_config) ?;
1013
1020
0 commit comments