WIP: Update ndk to r21

Author: robinlinden

scripts/android.mk

@@ -7,8 +7,11 @@ PREFIX		:= $(SYSROOT)/usr
 TOOLCHAIN_FILE	:= $(SRCDIR)/$(TARGET).cmake
 PROTOC		:= $(DESTDIR)/host/bin/protoc
 
-export CC		:= $(TOOLCHAIN)/bin/$(TARGET)-clang
-export CXX		:= $(TOOLCHAIN)/bin/$(TARGET)-clang++
+export CC  := $(NDK_HOME)/toolchains/llvm/prebuilt/linux-x86_64/bin/$(TARGET)$(NDK_API)-clang
+export CXX := $(NDK_HOME)/toolchains/llvm/prebuilt/linux-x86_64/bin/$(TARGET)$(NDK_API)-clang++
+
+#export CC		:= $(TOOLCHAIN)/bin/$(TARGET)-clang
+#export CXX		:= $(TOOLCHAIN)/bin/$(TARGET)-clang++
 export LDFLAGS		:= -llog
 export PKG_CONFIG_LIBDIR:= $(PREFIX)/lib/pkgconfig
 export PKG_CONFIG_PATH	:= $(PREFIX)/lib/pkgconfig
@@ -33,22 +36,22 @@ $(NDK_HOME):
 	# This is put into the root dir, not into $(SRCDIR), because it's huge and
 	# clutters the Travis CI cache.
 	test -f $(NDK_PACKAGE) || curl -s $(NDK_URL) -o $(NDK_PACKAGE)
-	7z x $(NDK_PACKAGE) $(foreach x,$(NDK_FILES),'-ir!$(NDK_DIR)/$x') > /dev/null
+	7z x $(NDK_PACKAGE) $(foreach x,$(NDK_FILES),'-ir!$(NDK_DIR)/$x')
 	rm -rf $@
 	mv $(NDK_DIR) $@
 	@$(POST_RULE)
 
-$(TOOLCHAIN)/AndroidVersion.txt: $(NDK_HOME)
-	@$(PRE_RULE)
-	$</build/tools/make_standalone_toolchain.py	\
-		--arch $(NDK_ARCH)			\
-		--install-dir $(@D)			\
-		--api $(NDK_API)			\
-		--force
-	@$(POST_RULE)
-	@touch $@
+# $(TOOLCHAIN)/AndroidVersion.txt: $(NDK_HOME)
+# 	@$(PRE_RULE)
+# 	$</build/tools/make_standalone_toolchain.py	\
+# 		--arch $(NDK_ARCH)			\
+# 		--install-dir $(@D)			\
+# 		--api $(NDK_API)			\
+# 		--force
+# 	@$(POST_RULE)
+# 	@touch $@
 
-$(TOOLCHAIN_FILE): $(TOOLCHAIN)/AndroidVersion.txt
+$(TOOLCHAIN_FILE): $(NDK_HOME)
 	@$(PRE_RULE)
 	mkdir -p $(@D)
 	echo 'set(CMAKE_SYSTEM_NAME Linux)' > $@

scripts/common.mk

@@ -9,7 +9,7 @@ export LDFLAGS		:=
 export PATH		:= $(DESTDIR)/host/bin:$(PATH)
 
 # Android NDK
-NDK_DIR		:= android-ndk-r13b
+NDK_DIR		:= android-ndk-r21
 NDK_PACKAGE	:= $(NDK_DIR)-$(shell perl -e 'print $$^O')-x86_64.zip
 NDK_URL		:= http://dl.google.com/android/repository/$(NDK_PACKAGE)
 

scripts/dependencies.mk

@@ -86,6 +86,9 @@ $(SRCDIR)/libvpx:
 
 $(TOOLCHAIN)/libvpx.stamp: $(SRCDIR)/libvpx $(TOOLCHAIN_FILE)
 	@$(PRE_RULE)
+	echo $(PATH)
+	mkdir -p $(TOOLCHAIN)/bin
+	ln -f $(CC) $(TOOLCHAIN)/bin/aarch64-linux-android-gcc
 	mkdir -p $(BUILDDIR)/$(notdir $<)
 	cd $(BUILDDIR)/$(notdir $<) && $(SRCDIR)/$(notdir $<)/configure $($(notdir $<)_CONFIGURE)
 	$(MAKE) -C $(BUILDDIR)/$(notdir $<) install