Remove Android debug configs (for now)

tangrams · Dec 19, 2016 · b859576 · b859576
1 parent 4534136
commit b859576
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 25 deletions.
diff --git a/android/demo/build.gradle b/android/demo/build.gradle
@@ -22,12 +22,6 @@ android {
     res.srcDirs = ['res']
     assets.srcDirs = ['../../scenes']
   }
-  buildTypes {
-    debug {
-      // applicationIdSuffix ".debug"
-      jniDebuggable true
-    }
-  }
 
   aaptOptions.ignoreAssetsPattern "!*.ttf"
 }

diff --git a/android/tangram/build.gradle b/android/tangram/build.gradle
@@ -58,13 +58,6 @@ android {
   }
 }
 
-// Add gdb server to apk
-afterEvaluate {
-    Sync packageTask = project.getTasks().findByName("packageReleaseJniLibs")
-    if (packageTask) { packageTask.include(['**/gdbserver', '**/gdb.setup']) }
-
-    packageTask = project.getTasks().findByName("packageDebugJniLibs")
-    if (packageTask) { packageTask.include(['**/gdbserver', '**/gdb.setup']) }
 }
 
 dependencies {

diff --git a/toolchains/android.cmake b/toolchains/android.cmake
@@ -8,14 +8,6 @@ add_subdirectory(${PROJECT_SOURCE_DIR}/core)
 
 set(ANDROID_PROJECT_DIR ${PROJECT_SOURCE_DIR}/android/tangram)
 
-if(CMAKE_BUILD_TYPE MATCHES Debug)
- if(POLICY CMP0026)
-   cmake_policy(SET CMP0026 OLD)
- endif()
- include(toolchains/android.gdb.cmake)
- android_ndk_gdb_enable()
-endif()
-
 set(LIB_NAME tangram) # in order to have libtangram.so
 
 add_library(${LIB_NAME} SHARED
@@ -42,10 +34,6 @@ target_compile_options(${LIB_NAME}
   PUBLIC
   -fPIC)
 
-if(CMAKE_BUILD_TYPE MATCHES Debug)
-  android_ndk_gdb_debuggable(${LIB_NAME})
-endif()
-
 # install to android library dir
 set(LIB_INSTALLATION_PATH ${CMAKE_SOURCE_DIR}/android/tangram/libs/${ANDROID_ABI})