diff options
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | coreconf/Linux.mk | 5 |
2 files changed, 9 insertions, 2 deletions
@@ -56,7 +56,11 @@ NSPR_CONFIGURE = $(CORE_DEPTH)/../nspr/configure # ifeq ($(OS_TARGET),Android) -NSPR_CONFIGURE_OPTS += --with-android-ndk=$(ANDROID_NDK) --target=arm-linux-androideabi --with-android-version=$(OS_TARGET_RELEASE) +NSPR_CONFIGURE_OPTS += --with-android-ndk=$(ANDROID_NDK) \ + --target=$(ANDROID_PREFIX) \ + --with-android-version=$(OS_TARGET_RELEASE) \ + --with-android-toolchain=$(ANDROID_TOOLCHAIN) \ + --with-android-platform=$(ANDROID_SYSROOT) endif ifdef BUILD_OPT NSPR_CONFIGURE_OPTS += --disable-debug --enable-optimize diff --git a/coreconf/Linux.mk b/coreconf/Linux.mk index e1e50654b..7111998c4 100644 --- a/coreconf/Linux.mk +++ b/coreconf/Linux.mk @@ -26,8 +26,11 @@ ifeq ($(OS_TARGET),Android) ifndef ANDROID_NDK $(error Must set ANDROID_NDK to the path to the android NDK first) endif +ifndef ANDROID_TOOLCHAIN_VERSION + $(error Must set ANDROID_TOOLCHAIN_VERSION to the requested version number) +endif ANDROID_PREFIX=$(OS_TEST)-linux-androideabi - ANDROID_TARGET=$(ANDROID_PREFIX)-4.4.3 + ANDROID_TARGET=$(ANDROID_PREFIX)-$(ANDROID_TOOLCHAIN_VERSION) # should autodetect which linux we are on, currently android only # supports linux-x86 prebuilts ANDROID_TOOLCHAIN=$(ANDROID_NDK)/toolchains/$(ANDROID_TARGET)/prebuilt/linux-x86 |