BC2A-1408: Fix conflict name issue during APP building #445
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #445 +/- ##
=======================================
Coverage 60.18% 60.18%
=======================================
Files 12 12
Lines 1660 1660
=======================================
Hits 999 999
Misses 661 661
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
cedelavergne-ledger
force-pushed
the
cev/B2CA-1408_conflict-name
branch
from
1893c51 to
9a42969
Compare
cedelavergne-ledger
force-pushed
the
cev/B2CA-1408_conflict-name
branch
11 times, most recently
from
ff7fff3 to
3be6789
Compare
cedelavergne-ledger
requested review from
sgliner-ledger,
xchapron-ledger and
tdejoigny-ledger
cedelavergne-ledger
force-pushed
the
cev/B2CA-1408_conflict-name
branch
from
3be6789 to
4735a38
Compare
cedelavergne-ledger
force-pushed
the
cev/B2CA-1408_conflict-name
branch
from
4735a38 to
1771d90
Compare
cedelavergne-ledger
force-pushed
the
cev/B2CA-1408_conflict-name
branch
2 times, most recently
from
d6e9b52 to
be17acd
Compare
cedelavergne-ledger
force-pushed
the
cev/B2CA-1408_conflict-name
branch
6 times, most recently
from
91706a0 to
33e1b0e
Compare
cedelavergne-ledger
force-pushed
the
cev/B2CA-1408_conflict-name
branch
from
33e1b0e to
617ed86
Compare
cedelavergne-ledger
force-pushed
the
cev/B2CA-1408_conflict-name
branch
2 times, most recently
from
1ceb081 to
4a4e0a4
Compare
cedelavergne-ledger
force-pushed
the
cev/B2CA-1408_conflict-name
branch
from
2316c5d to
2358307
Compare
- Separate object files into 2 distinct directories for both SDK and APP - Same modification for dependency files - Warn if same headers filename are found in both SDK and APP - Simplify the way source files list is generated
cedelavergne-ledger
force-pushed
the
cev/B2CA-1408_conflict-name
branch
from
2358307 to
cc8702b
Compare
xchapron-ledger
approved these changes
Dec 18, 2023
This was referenced Jan 24, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Avoid object files conflict when building an APP:
✔️ Tested and validated with
bolos-ng.Jira ticket: https://ledgerhq.atlassian.net/browse/B2CA-1408
This also fixes a dependency issue on
nanos, where make always rebuilds everything.Impacted Apps (found with this repository CI):
app-algorand:base64_encodein both App andzxlibdependency.app-ardor:obj/path. An external PR is currently under security review before being merged soon. It is probably easier to wait for it before merging mine.app-cryptocom:app-main.c, in both App andzxlibdependency.app-hive:app-tezos:Impacted Apps (found with
ledger-app-tester):app-grestlcoin:cx_groestl.app-kaspa:apdu_parserin both App and SDK.Changes include