fix(makefile): fix the arch for the SDS build being hardcoded #7199
+5
−1
Conversation
This file contains hidden or 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
Member
Jenkins BuildsClick to see older builds (10)
|
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## develop #7199 +/- ##
===========================================
- Coverage 60.49% 60.41% -0.08%
===========================================
Files 815 815
Lines 113163 113163
===========================================
- Hits 68454 68371 -83
- Misses 37661 37737 +76
- Partials 7048 7055 +7
Flags with carried forward coverage won't be shown. Click here to find out more. |
Contributor
Ivansete-status
left a comment
Ivansete-status
left a comment
There was a problem hiding this comment.
Thanks for it! Just adding some nitpicks that I hope you find useful
Makefile
Outdated
| @echo "Building nim-sds for Android" $(LIBSDS) | ||
| $(MAKE) -C $(NIM_SDS_SOURCE_DIR) libsds-android ARCH=arm64 ANDROID_NDK_ROOT=$(ANDROID_NDK_ROOT) USE_SYSTEM_NIM=1 SHELL=/bin/bash | ||
| @if [ "$(ARCH)" != "arm64" ]; then SDSARCH=amd64; else SDSARCH=$(ARCH); fi; \ | ||
| $(MAKE) -C $(NIM_SDS_SOURCE_DIR) libsds-android ARCH=$$SDSARCH ANDROID_NDK_ROOT=$(ANDROID_NDK_ROOT) USE_SYSTEM_NIM=1 SHELL=/bin/bash |
Contributor
There was a problem hiding this comment.
Maybe? To keep consistency with others
Suggested change
| $(MAKE) -C $(NIM_SDS_SOURCE_DIR) libsds-android ARCH=$$SDSARCH ANDROID_NDK_ROOT=$(ANDROID_NDK_ROOT) USE_SYSTEM_NIM=1 SHELL=/bin/bash | |
| $(MAKE) -C $(NIM_SDS_SOURCE_DIR) libsds-android ARCH=$(SDSARCH) ANDROID_NDK_ROOT=$(ANDROID_NDK_ROOT) USE_SYSTEM_NIM=1 SHELL=/bin/bash |
Makefile
Outdated
| build-libsds-android: clone-nim-sds | ||
| @echo "Building nim-sds for Android" $(LIBSDS) | ||
| $(MAKE) -C $(NIM_SDS_SOURCE_DIR) libsds-android ARCH=arm64 ANDROID_NDK_ROOT=$(ANDROID_NDK_ROOT) USE_SYSTEM_NIM=1 SHELL=/bin/bash | ||
| @if [ "$(ARCH)" != "arm64" ]; then SDSARCH=amd64; else SDSARCH=$(ARCH); fi; \ |
Contributor
There was a problem hiding this comment.
With that approach it seems we are ignoring the x86 option. See: https://github.com/logos-messaging/nim-sds/blob/0b4d3cc03ff44e7a6a16e32fe1d68ded44743e13/Makefile#L158C1-L164C28
jrainville
force-pushed
the
fix/sds-hardcoded-arch
branch
from
6656819 to
28aa992
Compare
jrainville
force-pushed
the
fix/sds-hardcoded-arch
branch
from
28aa992 to
a8d10ea
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
No description provided.