Android adjustment & Askar udl impl (#1263)

* Updated unffi README.md new sh command with the new folder structure Signed-off-by: alberto-instnt <[email protected]> * removed unused code and suppressed warnings/erros Signed-off-by: Alberto Leon <[email protected]> * fixed formatting Signed-off-by: Alberto Leon <[email protected]> * adjust andorid script & udl Signed-off-by: Alberto Leon <[email protected]> --------- Signed-off-by: alberto-instnt <[email protected]> Signed-off-by: Alberto Leon <[email protected]>
hyperledger · Jul 14, 2024 · 398af5b · 398af5b
1 parent 9d5f1b5
commit 398af5b
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/aries/wrappers/uniffi-aries-vcx/core/Cargo.toml b/aries/wrappers/uniffi-aries-vcx/core/Cargo.toml
@@ -16,7 +16,7 @@ path = "uniffi-bindgen.rs"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [features]
-default = ["vdrtools_wallet"]
+default = ["askar_wallet"]
 askar_wallet = ["aries_vcx/askar_wallet"]
 vdrtools_wallet = ["aries_vcx/vdrtools_wallet"]
 

diff --git a/aries/wrappers/uniffi-aries-vcx/core/build.rs b/aries/wrappers/uniffi-aries-vcx/core/build.rs
@@ -6,5 +6,5 @@ fn main() {
     uniffi::generate_scaffolding("./src/vcx_indy.udl").unwrap();
 
     #[cfg(feature = "askar_wallet")]
-    uniffi::generate_scaffolding("./src/vcx_askar.udl").unwrap();
+    uniffi::generate_scaffolding("./src/vcx.udl").unwrap();
 }
diff --git a/aries/wrappers/uniffi-aries-vcx/core/src/lib.rs b/aries/wrappers/uniffi-aries-vcx/core/src/lib.rs
@@ -2,7 +2,7 @@
 uniffi::include_scaffolding!("vcx_indy");
 
 #[cfg(feature = "askar_wallet")]
-uniffi::include_scaffolding!("vcx_askar");
+uniffi::include_scaffolding!("vcx");
 
 pub mod core;
 pub mod errors;

diff --git a/...s/uniffi-aries-vcx/core/src/vcx_askar.udl → ...rappers/uniffi-aries-vcx/core/src/vcx.udl b/...s/uniffi-aries-vcx/core/src/vcx_askar.udl → ...rappers/uniffi-aries-vcx/core/src/vcx.udl
diff --git a/aries/wrappers/uniffi-aries-vcx/scripts/android.build.cargo.ndk.sh b/aries/wrappers/uniffi-aries-vcx/scripts/android.build.cargo.ndk.sh
@@ -13,12 +13,12 @@ ABI="arm64-v8a"
 
 generate_bindings() {
     export UNIFFI_ROOT="${ARIES_VCX_ROOT}/aries/wrappers/uniffi-aries-vcx"
-    export ANDROID_DEMO_DIR="${ARIES_VCX_ROOT}/aries/agents/rust/mobile_demo"
+    export ANDROID_DEMO_DIR="${ARIES_VCX_ROOT}/aries/agents/mobile_demo"
 
     pushd "${UNIFFI_ROOT}/core"
-        cargo run --features=uniffi/cli --bin uniffi-bindgen generate src/vcx.udl --language ${LANGUAGE}
+                cargo run --features=uniffi/cli --bin uniffi-bindgen generate src/vcx.udl --language ${LANGUAGE}
     popd
-
+    
     cp -R ${UNIFFI_ROOT}/core/src/org/hyperledger/ariesvcx/vcx.kt ${ANDROID_DEMO_DIR}/app/src/main/java/org/hyperledger/ariesvcx
     rm -R ${UNIFFI_ROOT}/core/src/org
 }