Merge pull request #164 from LedgerHQ/y333/use_cstring

Enable heap allocator in SDK and perform CString conversion for NBGL
LedgerHQ · Jun 21, 2024 · c29f244 · c29f244
2 parents 42036eb + 599146a
commit c29f244
Show file tree

Hide file tree

Showing 4 changed files with 125 additions and 224 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/ledger_device_sdk/.cargo/config.toml b/ledger_device_sdk/.cargo/config.toml
@@ -14,8 +14,8 @@ runner = "speculos --model stax --display=headless"
 runner = "speculos --model flex --display=headless"
 
 [unstable]
-build-std = ["core"]
+build-std = ["core", "alloc"]
 build-std-features = ["compiler-builtins-mem"]
 
 [build]
-target = "nanosplus"
+target = "stax"
diff --git a/ledger_device_sdk/Cargo.toml b/ledger_device_sdk/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ledger_device_sdk"
-version = "1.10.3"
+version = "1.10.4"
 authors = ["yhql", "yogh333", "agrojean-ledger", "kingofpayne"]
 edition = "2021"
 license.workspace = true
@@ -15,15 +15,19 @@ ledger_device_sdk = { path = ".", features = ["speculos"] }
 testmacro = { path = "../testmacro", version = "0.1.0"}
 
 [dependencies]
-ledger_secure_sdk_sys = {path = "../ledger_secure_sdk_sys", version = "1.4.1"}
 include_gif = {path = "../include_gif", version = "1.1.0"}
 num-traits = { version = "0.2.14", default_features = false }
 rand_core = { version = "0.6.3", default_features = false }
 zeroize = { version = "1.6.0", default_features = false }
 numtoa = "0.2.4"
 const-zero = "0.1.1"
 
+[target.'cfg(target_os="nanos")'.dependencies]
+ledger_secure_sdk_sys = {path = "../ledger_secure_sdk_sys", version = "1.4.1"}
+
+[target.'cfg(not(target_os="nanos"))'.dependencies]
+ledger_secure_sdk_sys = {path = "../ledger_secure_sdk_sys", version = "1.4.1", features = ["heap"]}
+
 [features]
 speculos = []
 ccid = []
-heap = ["ledger_secure_sdk_sys/heap"]