Skip to content

Commit 4c63f9e

Browse files
committed
fix some compile issue & add arch for x86_64
1 parent f5fa4f8 commit 4c63f9e

File tree

5 files changed

+4
-4
lines changed

5 files changed

+4
-4
lines changed

library/src/main/jni/Android.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ LOCAL_SRC_FILES := \
7373
$(CGE_SOURCE)/filters/cgeEdgeFilter.cpp \
7474
$(CGE_SOURCE)/filters/cgeEmbossFilter.cpp \
7575
$(CGE_SOURCE)/filters/cgeCrosshatchFilter.cpp \
76-
$(CGE_SOURCE)/filters/CGELiquifyFilter.cpp \
76+
$(CGE_SOURCE)/filters/cgeLiquifyFilter.cpp \
7777
$(CGE_SOURCE)/filters/cgeRandomBlurFilter.cpp \
7878
$(CGE_SOURCE)/filters/cgeMinValueFilter.cpp \
7979
$(CGE_SOURCE)/filters/cgeMaxValueFilter.cpp \

library/src/main/jni/Application.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

2-
APP_ABI := armeabi-v7a arm64-v8a x86
2+
# APP_ABI := armeabi-v7a arm64-v8a x86
33
# armeabi & mips are deprecated
4-
#APP_ABI := armeabi-v7a
4+
APP_ABI := all
55

66
APP_PLATFORM := android-16
77

library/src/main/jni/setup_android_toolchain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export NDK_STANDALONE_TOOLCHAIN=$NDK/ndk-build-toolchain
1111

1212
if [[ ! -d "$NDK_STANDALONE_TOOLCHAIN" ]]; then
1313

14-
$NDK/build/tools/make-standalone-toolchain.sh --toolchain=arm-linux-android-clang3.6 --arch=arm --platform=android-26 --install-dir=$NDK_STANDALONE_TOOLCHAIN --stl=libc++
14+
$NDK/build/tools/make-standalone-toolchain.sh --toolchain=arm-linux-android-clang3.6 --arch=arm --platform=android-16 --install-dir=$NDK_STANDALONE_TOOLCHAIN --stl=libc++
1515

1616
fi
1717

0 commit comments

Comments
 (0)