feat: Use submodule or local override

.gitignore

@@ -8,3 +8,4 @@ local.properties
 *.hprof
 .cxx
 sentry-native-local/
+**/sentry-native-local

README.md

@@ -11,3 +11,14 @@ Android SDK for Sentry
 [![AppVeyor](https://ci.appveyor.com/api/projects/status/kr49snupeb1dsgwa/branch/master?svg=true)](https://ci.appveyor.com/project/sentry/sentry-android/branch/master)
 [![Tests](https://img.shields.io/appveyor/tests/sentry/sentry-android/master?compact_message)](https://ci.appveyor.com/project/sentry/sentry-android/branch/master/tests)
 [![codecov](https://codecov.io/gh/getsentry/sentry-android/branch/master/graph/badge.svg)](https://codecov.io/gh/getsentry/sentry-android)
+
+# Development
+
+This repository includes [`sentry-native`](https://github.com/getsentry/sentry-native/) as a git submodule.
+To build against `sentry-native` checked-out elsewhere in your file system, create a symlink to `sentry-android-ndk/sentry-native-local`.
+For example, if you had `sentry-native` checked-out in a sibling directory to this repo:
+
+`ln -s ../sentry-native sentry-android-ndk/sentry-native-local`
+
+which will be picked up by `gradle` and used instead of the git submodule.
+This directory is algo included in `.gitignore` not to be shown as pending changes.

sentry-android-ndk/build.gradle.kts

@@ -3,19 +3,6 @@ plugins {
     id("com.android.library")
 }
 
-tasks.register("initNative") {
-    doFirst {
-        var sentryNativeSrc = "sentry-native"
-        if (File("${project.projectDir}/sentry-native-local").exists()) {
-            sentryNativeSrc = "sentry-native-local"
-        } else {
-            // TODO submodule init
-        }
-        println("Sentry-Native sources: $sentryNativeSrc")
-        throw IllegalArgumentException()
-    }
-}
-
 android {
     compileSdkVersion(Config.Android.compileSdkVersion)
     buildToolsVersion(Config.Android.buildToolsVersion)
@@ -30,10 +17,15 @@ android {
 
         minSdkVersion(21)
         externalNativeBuild {
+            val sentryNativeSrc = if (File("${project.projectDir}/sentry-native-local").exists()) {
+                "sentry-native-local"
+            } else {
+                "sentry-native"
+            }
             cmake {
                 arguments.add(0, "-DANDROID_STL=c++_static")
                 arguments.add(0, "-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON")
-                // arguments.add(0, "-DSENTRY_NATIVE_SRC=" + sentryNativeSrc)
+                arguments.add(0, "-DSENTRY_NATIVE_SRC=" + sentryNativeSrc)
             }
         }
         ndk {
@@ -55,7 +47,11 @@ dependencies {
     api(project(":sentry-android-core"))
 }
 
-tasks.named("assemble") {
-    dependsOn(":processResources")
+val initNative = tasks.register<Exec>("initNative") {
+    logger.log(LogLevel.LIFECYCLE, "Initializing git submodules")
+    commandLine("git", "submodule", "update", "--init", "--recursive")
 }
 
+tasks.named("preBuild") {
+    dependsOn(initNative)
+}