better cmake config

Author: wysaid

library/build.gradle

@@ -5,6 +5,11 @@ def usingCMakeCompile() {
     return gradle.ext != null && gradle.ext.has("usingCMakeCompile") && gradle.ext.usingCMakeCompile;
 }
 
+def usingCMakeCompileDebug() {
+    /// define  gradle.ext.usingCMakeCompileDebug = true to enable CMake Debug Mode.
+    return gradle.ext != null && gradle.ext.has("usingCMakeCompileDebug") && gradle.ext.usingCMakeCompileDebug;
+}
+
 android {
     compileSdkVersion rootProject.ext.android.compileSdkVersion
     buildToolsVersion rootProject.ext.android.buildToolsVersion
@@ -22,22 +27,48 @@ android {
         if (usingCMakeCompile()) {
             externalNativeBuild {
                 cmake {
-                    arguments "-DCGE_USE_VIDEO_MODULE=1",
+
+                    def cmakeBuildType = "";
+                    def cppExtraFlags = "";
+
+                    if (usingCMakeCompileDebug()) {
+                        cmakeBuildType = "-DCMAKE_BUILD_TYPE=Debug"
+                        cppExtraFlags = "-DDEBUG=1 -D_DEBUG=1"
+                    } else {
+                        cmakeBuildType = "-DCMAKE_BUILD_TYPE=Release"
+                        cppExtraFlags = "-Os -DNDEBUG=1 -D_NDEBUG=1"
+                    }
+
+                    arguments "-DCGE_USE_VIDEO_MODULE=ON",
                             "-DANDROID_STL=c++_static",
                             "-DANDROID_ARM_NEON=TRUE",
-                            "-DANDROID_GRADLE=1",
-                            "-DCGE_USE_VIDEO_MODULE=1"
+                            "-DANDROID_GRADLE=ON",
+                            cmakeBuildType
 
-                    cppFlags "-frtti -std=c++14"
+                    cFlags "-mfloat-abi=softfp -mfpu=vfp -Os -ffast-math -fPIC -DNO_LOCALE_SUPPORT -DANDROID_NDK"
+                    cppFlags "-frtti -std=c++14 -fPIE -fPIC -fno-exceptions -fvisibility-inlines-hidden -DNO_LOCALE_SUPPORT -DANDROID_NDK ${cppExtraFlags}"
+
+
+
+                    println("cmake arguments: " + arguments)
+                    println("cppFlags: " + cppFlags)
                 }
             }
+
+            ndk {
+                abiFilters 'arm64-v8a', 'armeabi-v7a', 'x86_64', 'x86'
+                // if (!usingCMakeCompileDebug()) {
+                //     debugSymbolLevel ''
+                // }
+            }
         }
     }
 
     if (usingCMakeCompile()) {
         externalNativeBuild {
             cmake {
                 path 'src/main/jni/CMakeLists.txt'
+                version "3.22.1"
             }
         }
     }

library/src/main/jni/Android.mk

@@ -101,7 +101,7 @@ LOCAL_SRC_FILES :=  \
 			$(CGE_ROOT)/interface/cgeDeformFilterWrapper.cpp \
 
 
-LOCAL_CPPFLAGS := -frtti -std=c++11
+LOCAL_CPPFLAGS := -frtti -std=c++14
 LOCAL_LDLIBS :=  -llog -lEGL -lGLESv2 -ljnigraphics
 
 # 'CGE_USE_VIDEO_MODULE' determines if the project should compile with ffmpeg.
@@ -156,7 +156,7 @@ include $(BUILD_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := ffmpeg
-LOCAL_CFLAGS := -mfloat-abi=softfp -mfpu=vfp -O3 -ffast-math -funroll-loops -fPIC
+LOCAL_CFLAGS := -mfloat-abi=softfp -mfpu=vfp -Os -ffast-math -fPIC
 ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
 LOCAL_CFLAGS := $(LOCAL_CFLAGS) march=armv7-a -mfpu=neon
 endif

library/src/main/jni/Application.mk

@@ -9,6 +9,6 @@ APP_STL := c++_static
 
 #APP_CPPFLAGS := -frtti -fexceptions
 #APP_CPPFLAGS := -fpermissive
-APP_CPPFLAGS := -frtti -std=c++11
+APP_CPPFLAGS := -frtti -std=c++14
 
 APP_OPTIM := release

library/src/main/jni/CMakeLists.txt

@@ -4,10 +4,6 @@ project(CGE)
 
 set(CMAKE_CXX_STANDARD 14)
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIE")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIE -frtti -std=c++14")
-set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fPIE -pie")
-
 option(CGE_USE_VIDEO_MODULE "boolean option to enable video module" OFF)
 
 if (NOT DEFINED ANDROID_GRADLE)
@@ -24,6 +20,9 @@ if (NOT DEFINED ANDROID_GRADLE)
 
     set(NDK_STANDALONE_TOOLCHAIN $ENV{NDK}/ndk-build-toolchain)
     message(${NDK_STANDALONE_TOOLCHAIN})
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIE")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIE -frtti -std=c++14")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fPIE")
     set(CMAKE_C_COMPILER ${NDK_STANDALONE_TOOLCHAIN}/bin/clang)
     set(CMAKE_CXX_COMPILER ${NDK_STANDALONE_TOOLCHAIN}/bin/clang++)
     set(CMAKE_SYSROOT ${NDK_STANDALONE_TOOLCHAIN}/sysroot)

settings.gradle

@@ -8,8 +8,13 @@ if (properties.getProperty('usingCMakeCompile', null) == null) {
     pFile.append('\nusingCMakeCompile=false\n')
 }
 
+if (properties.getProperty('usingCMakeCompileDebug', null) == null) {
+    pFile.append('\nusingCMakeCompileDebug=false\n')
+}
+
 if (gradle.ext == null) {
     gradle.ext = {}
 }
 
-gradle.ext.usingCMakeCompile = properties.getProperty("usingCMakeCompile", "") == "true"
+gradle.ext.usingCMakeCompile = properties.getProperty("usingCMakeCompile", "") == "true"
+gradle.ext.usingCMakeCompileDebug = properties.getProperty("usingCMakeCompileDebug", "") == "true"