Page MenuHomePhabricator
Files F3374393

D10394.id34822.diff
No OneTemporary
Actions

D10394.id34822.diff
View Options

diff --git a/native/android/app/build.gradle b/native/android/app/build.gradle
--- a/native/android/app/build.gradle
+++ b/native/android/app/build.gradle
@@ -384,7 +384,7 @@
def cxxBridgeCommonDir = "${nativeRustLibraryDir}/target/cxxbridge/rust"
task buildNativeRustLibrary(type: Exec) {
- commandLine "cargo", "build", "--features", "android", "--manifest-path", nativeRustLibraryManifestPath
+ commandLine "cargo", "build", "--manifest-path", nativeRustLibraryManifestPath
}
task copyNativeRustLibraryFiles(dependsOn: buildNativeRustLibrary, type: Copy) {
diff --git a/native/native_rust_library/Cargo.toml b/native/native_rust_library/Cargo.toml
--- a/native/native_rust_library/Cargo.toml
+++ b/native/native_rust_library/Cargo.toml
@@ -28,6 +28,3 @@
[lib]
crate-type = ["staticlib"]
-
-[features]
-android = []
diff --git a/native/native_rust_library/src/lib.rs b/native/native_rust_library/src/lib.rs
--- a/native/native_rust_library/src/lib.rs
+++ b/native/native_rust_library/src/lib.rs
@@ -1,9 +1,7 @@
use backup::ffi::*;
use comm_opaque2::client::{Login, Registration};
use comm_opaque2::grpc::opaque_error_to_grpc_status as handle_error;
-use ffi::{
- bool_callback, send_auth_metadata_to_js, string_callback, void_callback,
-};
+use ffi::{bool_callback, string_callback, void_callback};
use grpc_clients::identity::protos::authenticated::{
OutboundKeyInfo, OutboundKeysForUserRequest, UpdateUserPasswordFinishRequest,
UpdateUserPasswordStartRequest,
@@ -40,9 +38,9 @@
pub use generated::CODE_VERSION;
pub use generated::IDENTITY_SOCKET_ADDR;
-#[cfg(not(feature = "android"))]
+#[cfg(not(target_os = "android"))]
pub const DEVICE_TYPE: DeviceType = DeviceType::Ios;
-#[cfg(feature = "android")]
+#[cfg(target_os = "android")]
pub const DEVICE_TYPE: DeviceType = DeviceType::Android;
lazy_static! {
@@ -906,8 +904,7 @@
#[cfg(test)]
mod tests {
- use super::CODE_VERSION;
- use super::IDENTITY_SOCKET_ADDR;
+ use super::{CODE_VERSION, IDENTITY_SOCKET_ADDR};
#[test]
fn test_code_version_exists() {

File Metadata

Mime Type
text/plain
Expires
Wed, Nov 27, 3:24 PM (21 h, 51 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2590806
Default Alt Text
D10394.id34822.diff (2 KB)

Event Timeline