From fc5b05d86543bc2cf5272ec2f8d1bb662fb4280c Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Tue, 18 Nov 2014 10:36:37 +0100 Subject: [PATCH] Replace script to set sysroot with hardcoded one --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index cd75f4c08..c187007dd 100644 --- a/Makefile +++ b/Makefile @@ -15,8 +15,8 @@ MOST_RECENT_TARGET=$(shell android list target -c | grep android | tail -n1) SECOND_MOST_RECENT_TARGET=$(shell android list target -c | grep android | sed -e '1{$$q;}' -e '$$!{h;d;}' -e x) ANDROID_MOST_RECENT_TARGET=$(shell test $(MOST_RECENT_TARGET) = "android-21" && echo $(SECOND_MOST_RECENT_TARGET) || echo $(MOST_RECENT_TARGET)) # Force android-14 for compilation for now, some externals submodules doesn't support compilation with android-19 -ARM_SYSROOT=$(shell find "${NDK_PATH}" -name arch-arm -print | sort -V -r | tail -1 | sed -e "s/android-[0-9]\+/android-14/") -X86_SYSROOT=$(shell find "${NDK_PATH}" -name arch-x86 -print | sort -V -r | tail -1 | sed -e "s/android-[0-9]\+/android-14/") +ARM_SYSROOT=${NDK_PATH}/platforms/android-14/arch-arm +X86_SYSROOT=${NDK_PATH}/platforms/android-14/arch-x86 SQLITE_VERSION=3071700 SQLITE_BASENAME=sqlite-amalgamation-$(SQLITE_VERSION) SQLITE_URL=http://www.sqlite.org/2013/$(SQLITE_BASENAME).zip