logos-messaging/nim-sds
1
0
Fork 0
mirror of https://github.com/logos-messaging/nim-sds.git synced 2026-01-04 07:03:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename ANDROID_NDK_HOME to ANDROID_NDK_ROOT

Browse Source
This commit is contained in:
Ivan Folgueira Bande 2025-11-28 19:34:51 +01:00
parent 024b8c50e9
commit ae445d5585
No known key found for this signature in database
GPG Key ID: 3C117481F89E24A7
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -94,16 +94,16 @@ libsds: | deps
ANDROID_TARGET ?= 30 ANDROID_TARGET ?= 30
ifeq ($(detected_OS),Darwin) ifeq ($(detected_OS),Darwin)
ANDROID_TOOLCHAIN_DIR := $(ANDROID_NDK_HOME)/toolchains/llvm/prebuilt/darwin-x86_64 ANDROID_TOOLCHAIN_DIR := $(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/darwin-x86_64
else else
ANDROID_TOOLCHAIN_DIR := $(ANDROID_NDK_HOME)/toolchains/llvm/prebuilt/linux-x86_64 ANDROID_TOOLCHAIN_DIR := $(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/linux-x86_64
endif endif
# Fixes "clang: not found" errors # Fixes "clang: not found" errors
PATH := $(ANDROID_TOOLCHAIN_DIR)/bin:$(PATH) PATH := $(ANDROID_TOOLCHAIN_DIR)/bin:$(PATH)
libsds-android-precheck: libsds-android-precheck:
ifndef ANDROID_NDK_HOME ifndef ANDROID_NDK_ROOT
$(error ANDROID_NDK_HOME is not set) $(error ANDROID_NDK_ROOT is not set)
endif endif
build-libsds-for-android-arch: NIM_PARAMS := $(NIM_PARAMS) --passC="--sysroot=$(ANDROID_TOOLCHAIN_DIR)/sysroot" build-libsds-for-android-arch: NIM_PARAMS := $(NIM_PARAMS) --passC="--sysroot=$(ANDROID_TOOLCHAIN_DIR)/sysroot"

4
README.md
View File

@ -30,8 +30,8 @@ unzip android-ndk-r27c-linux.zip
Then, add the following to your ~/.bashrc file: Then, add the following to your ~/.bashrc file:
```code ```code
export ANDROID_NDK_HOME=$HOME/android-ndk-r27c export ANDROID_NDK_ROOT=$HOME/android-ndk-r27c
export PATH=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH export PATH=$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH
``` ```
Then, use one of the following commands, according to the current architecture: Then, use one of the following commands, according to the current architecture:

2
nix/default.nix
View File

@ -48,7 +48,7 @@ in stdenv.mkDerivation rec {
]; ];
ANDROID_SDK_ROOT = optionalString isAndroidBuild pkgs.androidPkgs.sdk; ANDROID_SDK_ROOT = optionalString isAndroidBuild pkgs.androidPkgs.sdk;
ANDROID_NDK_HOME = optionalString isAndroidBuild pkgs.androidPkgs.ndk; ANDROID_NDK_ROOT = optionalString isAndroidBuild pkgs.androidPkgs.ndk;
NIMFLAGS = "-d:disableMarchNative -d:git_revision_override=${version}"; NIMFLAGS = "-d:disableMarchNative -d:git_revision_override=${version}";
XDG_CACHE_HOME = "/tmp"; XDG_CACHE_HOME = "/tmp";

4
nix/pkgs/android-sdk/shell.nix
View File

@ -8,13 +8,13 @@ mkShell {
export ANDROID_HOME="${androidPkgs.sdk}" export ANDROID_HOME="${androidPkgs.sdk}"
export ANDROID_NDK_ROOT="${androidPkgs.ndk}" export ANDROID_NDK_ROOT="${androidPkgs.ndk}"
export ANDROID_SDK_ROOT="$ANDROID_HOME" export ANDROID_SDK_ROOT="$ANDROID_HOME"
export ANDROID_NDK_HOME="${androidPkgs.ndk}" export ANDROID_NDK_ROOT="${androidPkgs.ndk}"
export PATH="$ANDROID_NDK_ROOT:$PATH" export PATH="$ANDROID_NDK_ROOT:$PATH"
export PATH="$ANDROID_SDK_ROOT/tools:$PATH" export PATH="$ANDROID_SDK_ROOT/tools:$PATH"
export PATH="$ANDROID_SDK_ROOT/tools/bin:$PATH" export PATH="$ANDROID_SDK_ROOT/tools/bin:$PATH"
export PATH="$ANDROID_SDK_ROOT/platform-tools:$PATH" export PATH="$ANDROID_SDK_ROOT/platform-tools:$PATH"
export PATH="$(echo $ANDROID_SDK_ROOT/cmdline-tools/*/bin):$PATH" export PATH="$(echo $ANDROID_SDK_ROOT/cmdline-tools/*/bin):$PATH"
export PATH="$(echo $ANDROID_NDK_HOME/toolchains/llvm/prebuilt/*/bin):$PATH" export PATH="$(echo $ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/*/bin):$PATH"
''; '';
} }