make libvpx build work

Author: iphydf

scripts/android.mk

@@ -1,17 +1,14 @@
 NDK_HOME	:= $(SRCDIR)/$(NDK_DIR)/$(TARGET)
 
 DLLEXT		:= .so
-TOOLCHAIN	:= $(DESTDIR)/$(TARGET)
+TOOLCHAIN	:= $(NDK_HOME)/toolchains/llvm/prebuilt/linux-x86_64
 SYSROOT		:= $(TOOLCHAIN)/sysroot
 PREFIX		:= $(SYSROOT)/usr
 TOOLCHAIN_FILE	:= $(SRCDIR)/$(TARGET).cmake
 PROTOC		:= $(DESTDIR)/host/bin/protoc
 
-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 CC		:= $(TOOLCHAIN)/bin/$(TARGET)$(NDK_API)-clang
+export CXX		:= $(TOOLCHAIN)/bin/$(TARGET)$(NDK_API)-clang++
 export LDFLAGS		:= -llog
 export PKG_CONFIG_LIBDIR:= $(PREFIX)/lib/pkgconfig
 export PKG_CONFIG_PATH	:= $(PREFIX)/lib/pkgconfig
@@ -41,17 +38,7 @@ $(NDK_HOME):
 	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_FILE): $(NDK_HOME)
+$(TOOLCHAIN_FILE): $(NDK_HOME) scripts/android.mk
 	@$(PRE_RULE)
 	mkdir -p $(@D)
 	echo 'set(CMAKE_SYSTEM_NAME Linux)' > $@

scripts/build-aarch64-linux-android

@@ -4,11 +4,12 @@ TARGET := aarch64-linux-android
 
 include scripts/common.mk
 
-NDK_FILES := $(NDK_COMMON_FILES)				\
-	platforms/android-21/arch-arm64				\
-	prebuilt/android-arm64					\
-	sources/cxx-stl/gnu-libstdc++/4.9/libs/arm64-v8a	\
-	toolchains/aarch64-linux-android-4.9
+NDK_FILES := $(NDK_COMMON_FILES)						\
+	platforms/android-21/arch-arm64						\
+	toolchains/llvm/prebuilt/linux-x86_64/aarch64-linux-android		\
+	toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android-*	\
+	toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android21-*	\
+	toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/21
 
 NDK_API := 21
 NDK_ARCH := arm64

scripts/common.mk

@@ -13,10 +13,10 @@ 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)
 
-NDK_COMMON_FILES :=					\
-	build						\
-	sources/android/cpufeatures			\
-	sources/cxx-stl/gnu-libstdc++/4.9/include	\
-	prebuilt/linux-x86_64				\
-	prebuilt/darwin-x86_64				\
-	toolchains/llvm
+NDK_COMMON_FILES :=						\
+	sources/android/cpufeatures				\
+	toolchains/llvm/prebuilt/linux-x86_64/bin/clang		\
+	toolchains/llvm/prebuilt/linux-x86_64/bin/clang++	\
+	toolchains/llvm/prebuilt/linux-x86_64/lib/lib64		\
+	toolchains/llvm/prebuilt/linux-x86_64/lib64		\
+	toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include

scripts/patches/libvpx.patch

@@ -1,5 +1,5 @@
 diff --git a/build/make/configure.sh b/build/make/configure.sh
-index 4f0071b..f8e7b69 100644
+index 4f0071b..a4b7c58 100644
 --- a/build/make/configure.sh
 +++ b/build/make/configure.sh
 @@ -918,92 +918,6 @@ process_common_toolchain() {
@@ -95,7 +95,7 @@ index 4f0071b..f8e7b69 100644
        case ${tgt_os} in
          none*)
            disable_feature multithread
-@@ -1015,10 +929,16 @@ EOF
+@@ -1015,17 +929,23 @@ EOF
              die "Must specify --sdk-path for Android builds."
            fi
 
@@ -109,11 +109,25 @@ index 4f0071b..f8e7b69 100644
            COMPILER_LOCATION=`find "${SDK_PATH}" \
 -                             -name "arm-linux-androideabi-gcc*" -print -quit`
 -          TOOLCHAIN_PATH=${COMPILER_LOCATION%/*}/arm-linux-androideabi-
+-          CC=${TOOLCHAIN_PATH}gcc
+-          CXX=${TOOLCHAIN_PATH}g++
+-          AR=${TOOLCHAIN_PATH}ar
+-          LD=${TOOLCHAIN_PATH}gcc
+-          AS=${TOOLCHAIN_PATH}as
+-          STRIP=${TOOLCHAIN_PATH}strip
+-          NM=${TOOLCHAIN_PATH}nm
 +                             -name "${TRIPLE}-gcc*" -print -quit`
-+          TOOLCHAIN_PATH=${COMPILER_LOCATION%/*}/${TRIPLE}-
-           CC=${TOOLCHAIN_PATH}gcc
-           CXX=${TOOLCHAIN_PATH}g++
-           AR=${TOOLCHAIN_PATH}ar
++          TOOLCHAIN_PATH=${COMPILER_LOCATION%/*}/${TRIPLE}
++          CC=${TOOLCHAIN_PATH}21-clang
++          CXX=${TOOLCHAIN_PATH}21-clang++
++          AR=${TOOLCHAIN_PATH}-ar
++          LD=${TOOLCHAIN_PATH}21-clang
++          AS=${TOOLCHAIN_PATH}-as
++          STRIP=${TOOLCHAIN_PATH}-strip
++          NM=${TOOLCHAIN_PATH}-nm
+ 
+           if [ -z "${alt_libc}" ]; then
+             alt_libc=`find "${SDK_PATH}" -name arch-arm -print | \
 @@ -1041,9 +961,11 @@ EOF
              add_ldflags "--sysroot=${alt_libc}"
            fi