diff --git a/build/toolchain.android.mak b/build/toolchain.android.mak index ce2858a54..f24462a72 100644 --- a/build/toolchain.android.mak +++ b/build/toolchain.android.mak @@ -1,4 +1,5 @@ -NDK_PATH ?= /usr/local/android/ndk-bundle +ANDROID_HOME ?= /usr/local/android +NDK_PATH ?= $(ANDROID_HOME)/ndk-bundle ifeq ($(HOST),macos) NDK_HOST_TAG ?= darwin-x86_64 diff --git a/ion/src/simulator/android/Makefile b/ion/src/simulator/android/Makefile index 703a77e77..04d8dad46 100644 --- a/ion/src/simulator/android/Makefile +++ b/ion/src/simulator/android/Makefile @@ -54,7 +54,7 @@ epsilon_apk_deps += $(addprefix $(BUILD_DIR)/app/res/,mipmap/ic_launcher.png mip .PHONY: gradle_% gradle_%: $(epsilon_apk_deps) @echo "GRADLE ion/src/simulator/android/build.gradle" - $(Q) ANDROID_HOME=/usr/local/android EPSILON_VERSION=$(EPSILON_VERSION) BUILD_DIR=$(BUILD_DIR) ion/src/simulator/android/gradlew -b ion/src/simulator/android/build.gradle $* + $(Q) ANDROID_HOME=$(ANDROID_HOME) EPSILON_VERSION=$(EPSILON_VERSION) BUILD_DIR=$(BUILD_DIR) ion/src/simulator/android/gradlew -b ion/src/simulator/android/build.gradle $* DEFAULT = epsilon.apk