Skip to content

Commit 70cc0a8

Browse files
Merge pull request #507 from LedgerHQ/fix/apa/standard_plugin_mk_with_ledger_assert
Fix standard plugin build with ledger_assert
2 parents ac7b6e1 + 6c1567a commit 70cc0a8

File tree

5 files changed

+24
-4
lines changed

5 files changed

+24
-4
lines changed

src_plugin_sdk/CHANGELOG.md

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,25 @@
55
| :rotating_light: | Breaks build |
66
| :warning: | Breaks compatibility with app |
77

8-
## [latest](/) - 2023/10/19
8+
## [latest](/) - 2023/12/06
9+
10+
### Fixed
11+
12+
* standard\_plugin build ([this PR on the SDK](https://github.com/LedgerHQ/ledger-secure-sdk/pull/473) had broken it)
13+
14+
### Changed
15+
16+
* utils renamed to plugin\_utils to prevent filename conflicts in plugins
17+
18+
## [4d8e044](/../../commit/4d8e044) - 2023/11/09
19+
20+
### Added
21+
22+
* standard\_plugin Makefile so plugins can use it & have a really small Makefile
23+
with only the relevant information
24+
* Comments in the plugin interface header file
25+
26+
## [1fe4085](/../../commit/1fe4085) - 2023/10/19
927

1028
### Changed
1129

src_plugin_sdk/utils.c renamed to src_plugin_sdk/plugin_utils.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*****************************************************************************/
1717

18-
#include "utils.h"
18+
#include "plugin_utils.h"
1919

2020
bool find_selector(uint32_t selector, const uint32_t *array, size_t size, size_t *idx) {
2121
for (size_t i = 0; i < size; ++i) {
File renamed without changes.

src_plugin_sdk/standard_plugin.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ DISABLE_STANDARD_SNPRINTF = 1
5757
DISABLE_STANDARD_USB = 1
5858
DISABLE_STANDARD_WEBUSB = 1
5959
DISABLE_STANDARD_BAGL_UX_FLOW = 1
60+
DISABLE_DEBUG_LEDGER_ASSERT = 1
61+
DISABLE_DEBUG_THROW = 1
6062

6163
# Required for PRINTFs to compile
6264
ifeq ($(DEBUG),0)

tools/build_sdk.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,8 +210,8 @@ def merge_c_files(sources, nodes_to_extract):
210210

211211
files_to_copy = [
212212
"main.c",
213-
"utils.c",
214-
"utils.h",
213+
"plugin_utils.c",
214+
"plugin_utils.h",
215215
]
216216
for file in files_to_copy:
217217
shutil.copyfile("src_plugin_sdk/" + file,

0 commit comments

Comments
 (0)