zec
/
zcash-android-wallet-sdk
mirror of https://github.com/zcash/zcash-android-wallet-sdk.git

Remove cfg(target_os="android") restriction 

The crate lives inside the Android SDK, and will only ever target
Android devices, so it's fine to simplify here.
This commit is contained in:
Jack Grigg 2019-02-07 12:56:04 +00:00
parent e99ed5bdeb
commit a9674a148b
No known key found for this signature in database
GPG Key ID: 1B8D649257DB0829
2 changed files with 327 additions and 339 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Cargo.toml
View File

@ -9,7 +9,10 @@ description = "JNI backend for the Android wallet SDK"
publish = false
[dependencies]
android_logger = "0.6"
failure = "0.1"
jni = { version = "0.10", default-features = false }
log-panics = "2.0.0"
protobuf = "2"
rand = "0.4"
rusqlite = { version = "0.15", features = ["bundled"] }
@ -39,11 +42,6 @@ rev = "89cfef8515d5d88809c485a44fdc54572b9e5666"
git = "https://github.com/str4d/librustzcash.git"
rev = "89cfef8515d5d88809c485a44fdc54572b9e5666"
[target.'cfg(target_os="android")'.dependencies]
jni = { version = "0.10", default-features = false }
android_logger = "0.6"
log-panics = "2.0.0"
[lib]
name = "zcashwalletsdk"
path = "src/main/rust/lib.rs"

14
src/main/rust/lib.rs
View File

@ -16,10 +16,6 @@ mod sql;
const SAPLING_CONSENSUS_BRANCH_ID: u32 = 0x76b8_09bb;
/// JNI interface
#[cfg(target_os = "android")]
#[allow(non_snake_case)]
pub mod android {
extern crate android_logger;
extern crate jni;
extern crate log_panics;
@ -44,17 +40,13 @@ pub mod android {
};
use self::jni::JNIEnv;
use super::SAPLING_CONSENSUS_BRANCH_ID;
use crate::sql::{
get_address, get_balance, init_accounts_table, init_blocks_table, init_data_database,
scan_cached_blocks, send_to_address,
};
#[no_mangle]
pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_initLogs(
_env: JNIEnv,
_: JClass,
) {
pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_JniConverter_initLogs(_env: JNIEnv, _: JClass) {
android_logger::init_once(
Filter::default().with_min_level(Level::Trace),
Some("cash.z.rust.logs"),
@ -311,8 +303,7 @@ pub mod android {
.expect("Couldn't get Java string!")
.into();
let extsk =
match decode_extended_spending_key(HRP_SAPLING_EXTENDED_SPENDING_KEY_TEST, &extsk) {
let extsk = match decode_extended_spending_key(HRP_SAPLING_EXTENDED_SPENDING_KEY_TEST, &extsk) {
Ok(extsk) => extsk,
Err(e) => {
error!("Invalid ExtendedSpendingKey: {}", e);
@ -360,4 +351,3 @@ pub mod android {
}
}
}
}