Skip to content

Commit 0a93d4b

Browse files
committed
Update to NDK23
1 parent e987c7e commit 0a93d4b

File tree

4 files changed

+11
-7
lines changed

4 files changed

+11
-7
lines changed

library/build.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ android {
3232
jniLibs.srcDir 'src/main/libs' //set libs as .so's location instead of jni
3333
jni.srcDirs = [] //disable automatic ndk-build call with auto-generated Android.mk file
3434
}
35+
compileOptions {
36+
sourceCompatibility JavaVersion.VERSION_1_8
37+
targetCompatibility JavaVersion.VERSION_1_8
38+
}
3539

3640
}
3741

library/src/main/jni/Android.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@ LOCAL_SRC_FILES := \
102102
$(CGE_ROOT)/interface/cgeDeformFilterWrapper.cpp \
103103

104104

105-
LOCAL_CPPFLAGS := -frtti -std=gnu++11
106-
LOCAL_LDLIBS := -llog -lEGL -lGLESv2 -ljnigraphics -latomic
105+
LOCAL_CPPFLAGS := -frtti -std=c++11
106+
LOCAL_LDLIBS := -llog -lEGL -lGLESv2 -ljnigraphics
107107

108108
# 'CGE_USE_VIDEO_MODULE' determines if the project should compile with ffmpeg.
109109

library/src/main/jni/Application.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ APP_ABI := armeabi-v7a arm64-v8a x86
33
# armeabi & mips are deprecated
44
#APP_ABI := armeabi-v7a
55

6-
APP_PLATFORM := android-14
6+
APP_PLATFORM := android-16
77

8-
APP_STL := gnustl_static
8+
APP_STL := c++_static
99

1010
#APP_CPPFLAGS := -frtti -fexceptions
1111
#APP_CPPFLAGS := -fpermissive
12-
APP_CPPFLAGS := -frtti -std=gnu++11
12+
APP_CPPFLAGS := -frtti -std=c++11
1313

1414
APP_OPTIM := release

library/src/main/jni/source/source.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ LOCAL_SRC_FILES := \
3333
$(CGEEXT_ROOT)/cgeMultiInputFilter.cpp \
3434

3535

36-
LOCAL_CPPFLAGS := -frtti -std=gnu++11
37-
LOCAL_LDLIBS := -llog -lEGL -lGLESv2 -ljnigraphics -latomic
36+
LOCAL_CPPFLAGS := -frtti -std=c++11
37+
LOCAL_LDLIBS := -llog -lEGL -lGLESv2 -ljnigraphics
3838

3939
LOCAL_CFLAGS := -DANDROID_NDK -DCGE_LOG_TAG=\"cgeExt\" -DCGE_TEXTURE_PREMULTIPLIED=1 -D__STDC_CONSTANT_MACROS -D_CGE_DISABLE_GLOBALCONTEXT_ -O3 -ffast-math -D_CGE_ONLY_FILTERS_ -D_CGE_LOGS_
4040

0 commit comments

Comments
 (0)