diff --git a/Makefile b/Makefile index b797d07..40cacc7 100644 --- a/Makefile +++ b/Makefile @@ -94,16 +94,16 @@ libsds: | deps ANDROID_TARGET ?= 30 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 - 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 # Fixes "clang: not found" errors PATH := $(ANDROID_TOOLCHAIN_DIR)/bin:$(PATH) libsds-android-precheck: -ifndef ANDROID_NDK_HOME - $(error ANDROID_NDK_HOME is not set) +ifndef ANDROID_NDK_ROOT + $(error ANDROID_NDK_ROOT is not set) endif build-libsds-for-android-arch: NIM_PARAMS := $(NIM_PARAMS) --passC="--sysroot=$(ANDROID_TOOLCHAIN_DIR)/sysroot" diff --git a/README.md b/README.md index 32b11ec..701d5ee 100644 --- a/README.md +++ b/README.md @@ -30,8 +30,8 @@ unzip android-ndk-r27c-linux.zip Then, add the following to your ~/.bashrc file: ```code -export ANDROID_NDK_HOME=$HOME/android-ndk-r27c -export PATH=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH +export ANDROID_NDK_ROOT=$HOME/android-ndk-r27c +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: diff --git a/nix/default.nix b/nix/default.nix index 9d3eb8a..945bad5 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -48,7 +48,7 @@ in stdenv.mkDerivation rec { ]; 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}"; XDG_CACHE_HOME = "/tmp"; diff --git a/nix/pkgs/android-sdk/shell.nix b/nix/pkgs/android-sdk/shell.nix index 0afbf80..f1d93b6 100644 --- a/nix/pkgs/android-sdk/shell.nix +++ b/nix/pkgs/android-sdk/shell.nix @@ -8,13 +8,13 @@ mkShell { export ANDROID_HOME="${androidPkgs.sdk}" export ANDROID_NDK_ROOT="${androidPkgs.ndk}" 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_SDK_ROOT/tools:$PATH" export PATH="$ANDROID_SDK_ROOT/tools/bin:$PATH" export PATH="$ANDROID_SDK_ROOT/platform-tools:$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" ''; }