better project config

Author: wysaid

.gitignore

@@ -9,3 +9,4 @@ target/
 tmp
 objs/
 obj/
+build/

.vscode/settings.json

@@ -5,5 +5,10 @@
     "files.exclude": {
     },
     "files.associations": {
+        "*.h": "cpp",
+        "*.cc": "cpp",
+        "params.txt": "json",
+        "CMakeLists*.txt": "cmake",
+        "__config": "c"
     }
 }

library/CMakeLists.txt

@@ -2,13 +2,13 @@ apply plugin: 'com.android.library'
 
 def usingCMakeCompile() {
     /// define  gradle.ext.usingCMakeCompile = false to disable CMakeCompile Mode.
-    return gradle.ext == null || !gradle.ext.has("usingCMakeCompile") || !gradle.ext.has("usingCMakeCompile");
+    return gradle.ext != null && gradle.ext.has("usingCMakeCompile") && gradle.ext.usingCMakeCompile;
 }
 
 android {
     compileSdkVersion 25
     if(usingCMakeCompile()) {
-        ndkVersion "24.0.8215888"
+        ndkVersion "23.1.7779620"
     }
 
     defaultConfig {
@@ -30,7 +30,7 @@ android {
     }
     externalNativeBuild {
         cmake {
-            path 'CMakeLists.txt'
+            path 'src/main/jni/CMakeLists.txt'
         }
     }
 
@@ -44,14 +44,17 @@ android {
     ////////////////////////////////////////
 
     sourceSets.main {
-        jniLibs.srcDir 'src/main/libs' //set libs as .so's location instead of jni
-        //jni.srcDirs = [] //disable automatic ndk-build call with auto-generated Android.mk file
+        if(usingCMakeCompile()) {
+            jniLibs.srcDir 'src/main/libs' //set libs as .so's location instead of jni
+        }
+        else {
+            jni.srcDirs = [] //disable automatic ndk-build call with auto-generated Android.mk file
+        }        
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-
 }
 
 dependencies {

library/build.gradle

@@ -22,19 +22,25 @@ if (NOT DEFINED ANDROID_GRADLE)
 
     set(NDK_STANDALONE_TOOLCHAIN $ENV{NDK}/ndk-build-toolchain)
     message(${NDK_STANDALONE_TOOLCHAIN})
-    set(CMAKE_SYSTEM_NAME AndroidARM)
     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)
     set(CMAKE_FIND_ROOT_PATH ${NDK_STANDALONE_TOOLCHAIN})
 
-    add_definitions(--sysroot=${NDK_STANDALONE_TOOLCHAIN}/sysroot)
     if (DEFINED NDK_STANDALONE_TOOLCHAIN)
-        include_directories(${NDK_STANDALONE_TOOLCHAIN}/sysroot/usr/include)
+        set(NDK_INCLUDE_DIR ${NDK_STANDALONE_TOOLCHAIN}/sysroot/usr/include)
+        if (EXISTS ${NDK_STANDALONE_TOOLCHAIN}/sysroot/usr/include/aarch64-linux-android)
+            set(NDK_INCLUDE_DIR ${NDK_INCLUDE_DIR}
+                    ${NDK_STANDALONE_TOOLCHAIN}/sysroot/usr/include/aarch64-linux-android)
+        endif ()
+        include_directories(${NDK_INCLUDE_DIR})
     endif ()
 endif ()
 
 if (NOT DEFINED ANDROID_ABI)
     add_definitions(-DANDROID_ABI=arm64-v8a)
+else ()
+    add_definitions(-DANDROID_ABI=${ANDROID_ABI})
 endif ()
 
 execute_process(COMMAND find ${CMAKE_CURRENT_SOURCE_DIR}/cge -maxdepth 3 -type d OUTPUT_VARIABLE CGE_CORE_HEADER_DIR)
@@ -52,7 +58,7 @@ include_directories(
         ${CMAKE_CURRENT_SOURCE_DIR}/custom
         ${CMAKE_CURRENT_SOURCE_DIR}/ffmpeg)
 
-add_definitions(-DANDROID_NDK -DCGE_LOG_TAG=\"libCGE\" -DCGE_TEXTURE_PREMULTIPLIED=1 -D_CGE_USE_FFMPEG_ -D__STDC_CONSTANT_MACROS -D_CGE_DISABLE_GLOBALCONTEXT_ -O3 -ffast-math -D_CGE_ONLY_FILTERS_ -DANDROID_ARM_NEON)
+add_definitions(-DANDROID_NDK -DCGE_LOG_TAG=\"libCGE\" -DCGE_TEXTURE_PREMULTIPLIED=1 -D_CGE_USE_FFMPEG_ -D__STDC_CONSTANT_MACROS -D_CGE_DISABLE_GLOBALCONTEXT_ -O3 -D_CGE_ONLY_FILTERS_)
 
 add_library(CGE
         ${CGE_CORE_SRC}

library/src/main/jni/CMakeLists.txt

@@ -1,19 +1,52 @@
-#!/bin/sh
+#!/usr/bin/env bash
+
+if [[ "$1" == "-f" ]]; then
+    if command -v trash &>/dev/null; then
+        trash "$NDK/ndk-build-toolchain"
+    else
+        rm -rf "$NDK/ndk-build-toolchain"
+    fi
+
+    unset NDK_STANDALONE_TOOLCHAIN
+fi
 
 if [[ "$NDK_STANDALONE_TOOLCHAIN" == "" ]]; then
 
     if [[ "$NDK" == "" ]]; then
         echo "You should set the NDK variable to your ndk-dir!"
-        exit
+        exit 1
     fi
 
     export NDK_STANDALONE_TOOLCHAIN=$NDK/ndk-build-toolchain
 
     if [[ ! -d "$NDK_STANDALONE_TOOLCHAIN" ]]; then
 
-        $NDK/build/tools/make-standalone-toolchain.sh --toolchain=arm-linux-android-clang3.6 --arch=arm --platform=android-19 --install-dir=$NDK_STANDALONE_TOOLCHAIN --stl=libc++
+        NDK_VER=$(grep -i revision "$NDK/source.properties")
 
-    fi
+        NDK_VER="${NDK_VER/* /}"
+        echo "NDK_VER=$NDK_VER"
+
+        NDK_MAJOR_VER="${NDK_VER/.*/}"
+        echo "NDK_MAJOR_VER=$NDK_MAJOR_VER"
 
+        if [[ "$NDK_MAJOR_VER" -ge 23 ]]; then
+            # NDK23 and later does not support 'standardalone-toolchain'
+            # according to <https://developer.android.com/ndk/guides/other_build_systems > export directly
+            echo "NDK23 and later does not support 'standardalone-toolchain', export directly"
+            if [[ $(uname -s) == "Darwin" ]]; then
+                export NDK_STANDALONE_TOOLCHAIN="$NDK/toolchains/llvm/prebuilt/darwin-x86_64"
+            elif [[ $(uname -s) == "Linux" ]]; then
+                export NDK_STANDALONE_TOOLCHAIN="$NDK/toolchains/llvm/prebuilt/linux-x86_64"
+            else # windows (没啥意义)
+                export NDK_STANDALONE_TOOLCHAIN="$NDK/toolchains/llvm/prebuilt/windows-x86_64"
+            fi
+            pushd .
+            cd $NDK && ln -snf "$NDK_STANDALONE_TOOLCHAIN" ndk-build-toolchain
+            popd
+        else
+            $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++
+        fi
+    fi
 fi
+
 echo "NDK_STANDALONE_TOOLCHAIN=$NDK_STANDALONE_TOOLCHAIN"

library/src/main/jni/setup_android_toolchain

@@ -1 +1,15 @@
 include ':library', ':cgeDemo'
+
+def pFile = new File(settingsDir, 'local.properties')
+Properties properties = new Properties()
+properties.load(pFile.newDataInputStream())
+
+if (properties.getProperty('usingCMakeCompile', null) == null) {
+    pFile.append('\nusingCMakeCompile=false\n')
+}
+
+if (gradle.ext == null) {
+    gradle.ext = {}
+}
+
+gradle.ext.usingCMakeCompile = properties.getProperty("usingCMakeCompile", "") == "true"