Update NDK building script

Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>

library/src/main/libenc/jni/Android.mk

@@ -1,14 +1,39 @@
 LOCAL_PATH := $(call my-dir)
 
 ############# prebuilt ###############
+
 include $(CLEAR_VARS)
 LOCAL_MODULE := libyuv
-LOCAL_SRC_FILES := lib/libyuv.so
+
+ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
+    LOCAL_SRC_FILES := libs/armeabi-v7a/libyuv.so
+endif
+
+ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
+    LOCAL_SRC_FILES := libs/arm64-v8a/libyuv.so
+endif
+
+ifeq ($(TARGET_ARCH_ABI),x86)
+    LOCAL_SRC_FILES := libs/x86/libyuv.so
+endif
+
 include $(PREBUILT_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := libx264
-LOCAL_SRC_FILES := lib/libx264.a
+
+ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
+    LOCAL_SRC_FILES := libs/armeabi-v7a/libx264.a
+endif
+
+ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
+    LOCAL_SRC_FILES := libs/arm64-v8a/libx264.a
+endif
+
+ifeq ($(TARGET_ARCH_ABI),x86)
+    LOCAL_SRC_FILES := libs/x86/libx264.a
+endif
+
 include $(PREBUILT_STATIC_LIBRARY)
 
 ############# build libenc ###########
@@ -22,4 +47,5 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/libyuv/jni/include $(LOCAL_PATH)/libx264
 LOCAL_STATIC_LIBRARIES := libx264
 LOCAL_SHARED_LIBRARIES := libyuv
 LOCAL_DISABLE_FORMAT_STRING_CHECKS := true
+LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
 include $(BUILD_SHARED_LIBRARY)

library/src/main/libenc/jni/Application.mk

@@ -1,2 +1,2 @@
-APP_ABI := armeabi-v7a
+APP_ABI := armeabi-v7a arm64-v8a x86
-APP_PLATFORM := android-16
+APP_PLATFORM := android-24

library/src/main/libenc/jni/libx264/android_build_arm64_v8a.sh

@@ -0,0 +1,32 @@
+#!/bin/sh
+
+ANDROID_NDK=/home/leoma/MyOSP/android-ndk-r13b
+SYSROOT=$ANDROID_NDK/platforms/android-24/arch-arm64
+CROSS_PREFIX=$ANDROID_NDK/toolchains/aarch64-linux-android-4.9/prebuilt/linux-x86_64/bin/aarch64-linux-android-
+EXTRA_CFLAGS="-march=armv8-a -D__ANDROID__"
+EXTRA_LDFLAGS="-nostdlib"
+PREFIX=`pwd`/libs/arm64-v8a
+
+./configure --prefix=$PREFIX \
+        --host=aarch64-linux \
+        --sysroot=$SYSROOT \
+        --cross-prefix=$CROSS_PREFIX \
+        --extra-cflags="$EXTRA_CFLAGS" \
+        --extra-ldflags="$EXTRA_LDFLAGS" \
+        --enable-pic \
+        --enable-static \
+        --enable-strip \
+        --disable-cli \
+        --disable-win32thread \
+        --disable-avs \
+        --disable-swscale \
+        --disable-lavf \
+        --disable-ffms \
+        --disable-gpac \
+        --disable-lsmash
+
+make clean
+make STRIP= -j8 install || exit 1
+
+cp -f $PREFIX/lib/libx264.a $PREFIX
+rm -rf $PREFIX/include $PREFIX/lib $PREFIX/pkgconfig

library/src/main/libenc/jni/libx264/android_build_armeabi_v7a.sh

@@ -1,11 +1,11 @@
 #!/bin/sh
 
-ANDROID_NDK=/home/leoma/MyOSP/android-ndk-r10e
+ANDROID_NDK=/home/leoma/MyOSP/android-ndk-r13b
-SYSROOT=$ANDROID_NDK/platforms/android-16/arch-arm
+SYSROOT=$ANDROID_NDK/platforms/android-24/arch-arm
-CROSS_PREFIX=$ANDROID_NDK/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86_64/bin/arm-linux-androideabi-
+CROSS_PREFIX=$ANDROID_NDK/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi-
 EXTRA_CFLAGS="-march=armv7-a -mfloat-abi=softfp -mfpu=neon -D__ANDROID__ -D__ARM_ARCH_7__ -D__ARM_ARCH_7A__"
 EXTRA_LDFLAGS="-nostdlib"
-PREFIX=`pwd`/../lib
+PREFIX=`pwd`/libs/armeabi-v7a
 
 ./configure --prefix=$PREFIX \
         --host=arm-linux \

library/src/main/libenc/jni/libx264/android_build_x86.sh

@@ -0,0 +1,32 @@
+#!/bin/sh
+
+ANDROID_NDK=/home/leoma/MyOSP/android-ndk-r13b
+SYSROOT=$ANDROID_NDK/platforms/android-24/arch-x86
+CROSS_PREFIX=$ANDROID_NDK/toolchains/x86-4.9/prebuilt/linux-x86_64/bin/i686-linux-android-
+EXTRA_CFLAGS="-D__ANDROID__ -D__i686__"
+EXTRA_LDFLAGS="-nostdlib"
+PREFIX=`pwd`/libs/x86
+
+./configure --prefix=$PREFIX \
+        --host=i686-linux \
+        --sysroot=$SYSROOT \
+        --cross-prefix=$CROSS_PREFIX \
+        --extra-cflags="$EXTRA_CFLAGS" \
+        --extra-ldflags="$EXTRA_LDFLAGS" \
+        --enable-pic \
+        --enable-static \
+        --enable-strip \
+        --disable-cli \
+        --disable-win32thread \
+        --disable-avs \
+        --disable-swscale \
+        --disable-lavf \
+        --disable-ffms \
+        --disable-gpac \
+        --disable-lsmash
+
+make clean
+make STRIP= -j8 install || exit 1
+
+cp -f $PREFIX/lib/libx264.a $PREFIX
+rm -rf $PREFIX/include $PREFIX/lib $PREFIX/pkgconfig

library/src/main/libenc/jni/libyuv/jni/Application.mk

@@ -1,2 +1,2 @@
-APP_ABI := armeabi-v7a
+APP_ABI := armeabi-v7a arm64-v8a x86
-APP_PLATFORM := android-16
+APP_PLATFORM := android-24