enable -00 for cmake/ndkbuild

xmake-io · Jun 1, 2020 · de06bde · de06bde
1 parent 0946c54
commit de06bde
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -12,6 +12,7 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
+
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'

diff --git a/nativelib/build.gradle b/nativelib/build.gradle
@@ -1,7 +1,6 @@
 plugins {
     id 'org.tboox.gradle-xmake-plugin' version '1.1.0'
 }
-
 apply plugin: 'com.android.library'
 //apply plugin: "org.tboox.gradle-xmake-plugin"
 
@@ -19,10 +18,9 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
 
-        /*
         ndk {
             abiFilters "armeabi-v7a", "arm64-v8a"
-        }*/
+        }
 
         externalNativeBuild {
 
@@ -32,19 +30,21 @@ android {
                 abiFilters "armeabi-v7a", "arm64-v8a"
             }*/
 
+            /*
             xmake {
                 cppFlags "-DTEST", "-DTEST2"
-                buildMode "debug"
                 abiFilters "armeabi-v7a", "arm64-v8a"
-            }
+            }*/
         }
     }
 
     externalNativeBuild {
+
         /*
         ndkBuild {
             path "jni/Android.mk"
-        }*/
+        }
+        */
 
         /*
         cmake {
@@ -54,6 +54,7 @@ android {
         xmake {
             logLevel "verbose"
             path "jni/xmake.lua"
+            buildMode "debug"
             //program /usr/local/bin/xmake
             //stl "c++_shared"
             //stdcxx false
@@ -63,6 +64,7 @@ android {
     }
 
     buildTypes {
+
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'

diff --git a/nativelib/jni/Android.mk b/nativelib/jni/Android.mk
@@ -18,7 +18,8 @@ include $(CLEAR_VARS)
 DEBUG					:= n
 CRYPT					:= n
 LOCAL_MODULE			:= nativelib
-LOCAL_SRC_FILES			:= nativelib.cc 
+LOCAL_SRC_FILES			:= nativelib.cc
+LOCAL_CXXFLAGS          := -g -O0
 LOCAL_LDLIBS			:= -L$(SYSROOT)/usr/lib -L$(LOCAL_PATH) -llog -lz
 include $(BUILD_SHARED_LIBRARY)
 
diff --git a/nativelib/jni/CMakeLists.txt b/nativelib/jni/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.6.0)
 
 # target
 add_library(nativelib SHARED "")
-target_compile_options(nativelib PRIVATE -Os)
+target_compile_options(nativelib PRIVATE -O0 -g)
 target_sources(nativelib PRIVATE
     nativelib.cc
 )