diff --git a/library/src/main/jniLibs/armeabi-v7a/libenc.so b/library/src/main/jniLibs/armeabi-v7a/libenc.so index ce82e11..cdcf7d9 100755 Binary files a/library/src/main/jniLibs/armeabi-v7a/libenc.so and b/library/src/main/jniLibs/armeabi-v7a/libenc.so differ diff --git a/library/src/main/jniLibs/armeabi-v7a/libyuv.so b/library/src/main/jniLibs/armeabi-v7a/libyuv.so index e2301c6..e217657 100644 Binary files a/library/src/main/jniLibs/armeabi-v7a/libyuv.so and b/library/src/main/jniLibs/armeabi-v7a/libyuv.so differ diff --git a/library/src/main/jniLibs/x86/libenc.so b/library/src/main/jniLibs/x86/libenc.so index 0b203f3..a05357f 100755 Binary files a/library/src/main/jniLibs/x86/libenc.so and b/library/src/main/jniLibs/x86/libenc.so differ diff --git a/library/src/main/jniLibs/x86/libyuv.so b/library/src/main/jniLibs/x86/libyuv.so index e2da5b8..36f1467 100755 Binary files a/library/src/main/jniLibs/x86/libyuv.so and b/library/src/main/jniLibs/x86/libyuv.so differ diff --git a/library/src/main/libenc/jni/Android.mk b/library/src/main/libenc/jni/Android.mk index aef5ce3..942dbc7 100644 --- a/library/src/main/libenc/jni/Android.mk +++ b/library/src/main/libenc/jni/Android.mk @@ -9,10 +9,6 @@ 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 @@ -26,10 +22,6 @@ 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 diff --git a/library/src/main/libenc/jni/Application.mk b/library/src/main/libenc/jni/Application.mk index 0bee766..baad0ac 100644 --- a/library/src/main/libenc/jni/Application.mk +++ b/library/src/main/libenc/jni/Application.mk @@ -1,2 +1,2 @@ -APP_ABI := armeabi-v7a arm64-v8a x86 -APP_PLATFORM := android-21 +APP_ABI := armeabi-v7a x86 +APP_PLATFORM := android-19 diff --git a/library/src/main/libenc/jni/libs/arm64-v8a/libx264.a b/library/src/main/libenc/jni/libs/arm64-v8a/libx264.a deleted file mode 100644 index cd00705..0000000 Binary files a/library/src/main/libenc/jni/libs/arm64-v8a/libx264.a and /dev/null differ diff --git a/library/src/main/libenc/jni/libs/arm64-v8a/libyuv.so b/library/src/main/libenc/jni/libs/arm64-v8a/libyuv.so deleted file mode 100755 index 1ad5542..0000000 Binary files a/library/src/main/libenc/jni/libs/arm64-v8a/libyuv.so and /dev/null differ diff --git a/library/src/main/libenc/jni/libs/armeabi-v7a/libx264.a b/library/src/main/libenc/jni/libs/armeabi-v7a/libx264.a index 44ddd7f..566f60d 100644 Binary files a/library/src/main/libenc/jni/libs/armeabi-v7a/libx264.a and b/library/src/main/libenc/jni/libs/armeabi-v7a/libx264.a differ diff --git a/library/src/main/libenc/jni/libs/armeabi-v7a/libyuv.so b/library/src/main/libenc/jni/libs/armeabi-v7a/libyuv.so index e2301c6..e217657 100755 Binary files a/library/src/main/libenc/jni/libs/armeabi-v7a/libyuv.so and b/library/src/main/libenc/jni/libs/armeabi-v7a/libyuv.so differ diff --git a/library/src/main/libenc/jni/libs/x86/libx264.a b/library/src/main/libenc/jni/libs/x86/libx264.a index 4423385..7b229c3 100644 Binary files a/library/src/main/libenc/jni/libs/x86/libx264.a and b/library/src/main/libenc/jni/libs/x86/libx264.a differ diff --git a/library/src/main/libenc/jni/libs/x86/libyuv.so b/library/src/main/libenc/jni/libs/x86/libyuv.so index e2da5b8..36f1467 100755 Binary files a/library/src/main/libenc/jni/libs/x86/libyuv.so and b/library/src/main/libenc/jni/libs/x86/libyuv.so differ diff --git a/library/src/main/libenc/jni/libx264/android_build_arm64_v8a.sh b/library/src/main/libenc/jni/libx264/android_build_arm64_v8a.sh deleted file mode 100755 index cb75009..0000000 --- a/library/src/main/libenc/jni/libx264/android_build_arm64_v8a.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh - -ANDROID_NDK=/home/leoma/MyOSP/android-ndk-r13b -SYSROOT=$ANDROID_NDK/platforms/android-21/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 diff --git a/library/src/main/libenc/jni/libx264/android_build_armeabi_v7a.sh b/library/src/main/libenc/jni/libx264/android_build_armeabi_v7a.sh index 4bd6b8d..d0ca615 100755 --- a/library/src/main/libenc/jni/libx264/android_build_armeabi_v7a.sh +++ b/library/src/main/libenc/jni/libx264/android_build_armeabi_v7a.sh @@ -1,7 +1,7 @@ #!/bin/sh ANDROID_NDK=/home/leoma/MyOSP/android-ndk-r13b -SYSROOT=$ANDROID_NDK/platforms/android-21/arch-arm +SYSROOT=$ANDROID_NDK/platforms/android-19/arch-arm 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" diff --git a/library/src/main/libenc/jni/libx264/android_build_x86.sh b/library/src/main/libenc/jni/libx264/android_build_x86.sh index 8aeaacb..05dbd7c 100755 --- a/library/src/main/libenc/jni/libx264/android_build_x86.sh +++ b/library/src/main/libenc/jni/libx264/android_build_x86.sh @@ -1,7 +1,7 @@ #!/bin/sh ANDROID_NDK=/home/leoma/MyOSP/android-ndk-r13b -SYSROOT=$ANDROID_NDK/platforms/android-21/arch-x86 +SYSROOT=$ANDROID_NDK/platforms/android-19/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" diff --git a/library/src/main/libenc/jni/libyuv/jni/Application.mk b/library/src/main/libenc/jni/libyuv/jni/Application.mk index 0bee766..baad0ac 100644 --- a/library/src/main/libenc/jni/libyuv/jni/Application.mk +++ b/library/src/main/libenc/jni/libyuv/jni/Application.mk @@ -1,2 +1,2 @@ -APP_ABI := armeabi-v7a arm64-v8a x86 -APP_PLATFORM := android-21 +APP_ABI := armeabi-v7a x86 +APP_PLATFORM := android-19