updated aw-server-rust and added some comments

ActivityWatch · Aug 13, 2019 · 068a68f · 068a68f
1 parent c0d8f16
commit 068a68f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/aw-server-rust b/aw-server-rust
diff --git a/mobile/build.gradle b/mobile/build.gradle
@@ -10,10 +10,15 @@ android {
         applicationId "net.activitywatch.android"
         minSdkVersion 24
         targetSdkVersion 28
-        // versionCode and versionName updated automatically in deploy script
+        // versionCode and versionName are updated automatically in deploy script
         versionCode 14
         versionName "0.4-dev"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+
+        // WARNING: Never commit this uncommented!
+        //packagingOptions {
+        //    doNotStrip '**/*.so'
+        //}
     }
     buildTypes {
         release {
@@ -25,6 +30,13 @@ android {
         }
     }
 
+    // Never got this to work...
+    if (project.hasProperty("doNotStrip")) {
+        packagingOptions {
+            doNotStrip '**/*.so'
+        }
+    }
+
     // Creates a resource versionName with the full version
     // https://stackoverflow.com/a/36468650/965332
     applicationVariants.all { variant ->

diff --git a/mobile/src/main/java/net/activitywatch/android/RustInterface.kt b/mobile/src/main/java/net/activitywatch/android/RustInterface.kt
@@ -16,10 +16,13 @@ private const val TAG = "RustInterface"
 class RustInterface constructor(context: Context? = null) {
 
     init {
+        // NOTE: This doesn't work, probably because I can't get gradle to not strip symbols on release builds
         //Os.setenv("RUST_BACKTRACE", "1", true)
+
         if(context != null) {
             Os.setenv("SQLITE_TMPDIR", context.cacheDir.absolutePath, true)
         }
+
         System.loadLibrary("aw_server")
 
         initialize()