Fix JNI bundling of SQLite KMP in AAR artifact.
The AndroidXMultiplatformExtension's addNativeLibrariesToJniLibs() API was using the 'debug' variant as default variant to add JNI files to, however artifacts are built from the 'release' variant, while tests use the 'debug' one. The API has been updated to add the JNI all variants.
Also remove `androidNative()` as a KMP target of sqlite projects since even though possible, we don't expect the library to be used in an Android native project.
Test: Validated sqlite-bundled-android-2.5.0-alpha01.aar contained jni directory with native files.
Change-Id: Iff8351ea52979026d28cedb525db835d491839ac
diff --git a/buildSrc/private/src/main/kotlin/androidx/build/AndroidXMultiplatformExtension.kt b/buildSrc/private/src/main/kotlin/androidx/build/AndroidXMultiplatformExtension.kt
index 70fbc32..967d798 100644
--- a/buildSrc/private/src/main/kotlin/androidx/build/AndroidXMultiplatformExtension.kt
+++ b/buildSrc/private/src/main/kotlin/androidx/build/AndroidXMultiplatformExtension.kt
@@ -283,34 +283,14 @@
fun addNativeLibrariesToJniLibs(
androidTarget: KotlinAndroidTarget,
nativeCompilation: MultiTargetNativeCompilation,
- variantBuildType: String = "debug",
forTest: Boolean = false
) = nativeLibraryBundler.addNativeLibrariesToJniLibs(
androidTarget = androidTarget,
nativeCompilation = nativeCompilation,
- variantBuildType = variantBuildType,
forTest = forTest
)
/**
- * Convenience method to add native libraries to the jniLibs input of an Android instrumentation
- * test.
- *
- * @see addNativeLibrariesToJniLibs
- */
- @JvmOverloads
- fun addNativeLibrariesToTestJniLibs(
- androidTarget: KotlinAndroidTarget,
- nativeCompilation: MultiTargetNativeCompilation,
- variantBuildType: String = "debug",
- ) = addNativeLibrariesToJniLibs(
- androidTarget = androidTarget,
- nativeCompilation = nativeCompilation,
- variantBuildType = variantBuildType,
- forTest = true
- )
-
- /**
* Convenience method to add bundle native libraries with a test jar.
*
* @see addNativeLibrariesToResources
diff --git a/buildSrc/private/src/main/kotlin/androidx/build/clang/NativeLibraryBundler.kt b/buildSrc/private/src/main/kotlin/androidx/build/clang/NativeLibraryBundler.kt
index 8d3766c..52a4cf2 100644
--- a/buildSrc/private/src/main/kotlin/androidx/build/clang/NativeLibraryBundler.kt
+++ b/buildSrc/private/src/main/kotlin/androidx/build/clang/NativeLibraryBundler.kt
@@ -70,25 +70,22 @@
/**
* Adds the shared library outputs from [nativeCompilation] to the jni libs dependency of
- * the [androidTarget]'s [variantBuildType].
+ * the [androidTarget].
*
* @see CombineObjectFilesTask for details.
*/
fun addNativeLibrariesToJniLibs(
androidTarget: KotlinAndroidTarget,
nativeCompilation: MultiTargetNativeCompilation,
- variantBuildType: String,
forTest: Boolean
) {
project.androidExtension.onVariants(
- project.androidExtension.selector().withBuildType(
- variantBuildType
- )
+ project.androidExtension.selector().all()
) { variant ->
fun setup(name: String, jniLibsSources: SourceDirectories.Layered?) {
checkNotNull(jniLibsSources) {
"Cannot find jni libs sources for variant: " +
- "$variant($variantBuildType / $forTest)"
+ "$variant (forTest=$forTest)"
}
val combineTask = project.tasks.register(
"createJniLibsDirectoryFor".appendCapitalized(
diff --git a/sqlite/integration-tests/driver-conformance-test/build.gradle b/sqlite/integration-tests/driver-conformance-test/build.gradle
index 7dfaa55..58a482a 100644
--- a/sqlite/integration-tests/driver-conformance-test/build.gradle
+++ b/sqlite/integration-tests/driver-conformance-test/build.gradle
@@ -31,7 +31,6 @@
androidXMultiplatform {
android()
- androidNative()
ios()
jvm()
linux()
diff --git a/sqlite/sqlite-bundled/build.gradle b/sqlite/sqlite-bundled/build.gradle
index c7f512f..8df8903 100644
--- a/sqlite/sqlite-bundled/build.gradle
+++ b/sqlite/sqlite-bundled/build.gradle
@@ -143,7 +143,7 @@
prepareSqliteSourcesTask.map { it.destinationDirectory }
)
- // Defince C++ compilation of JNI
+ // Define C++ compilation of JNI
def jvmArtJniImplementation = createNativeCompilation("jvmArtJniImplementation") {
configureEachTarget { nativeCompilation ->
// add JNI headers as sources
@@ -169,7 +169,6 @@
android() {
addNativeLibrariesToJniLibs(it, jvmArtJniImplementation)
}
- androidNative()
ios()
jvm() {
addNativeLibrariesToResources(it, jvmArtJniImplementation)
diff --git a/sqlite/sqlite-framework/build.gradle b/sqlite/sqlite-framework/build.gradle
index 48334b2..0add91b 100644
--- a/sqlite/sqlite-framework/build.gradle
+++ b/sqlite/sqlite-framework/build.gradle
@@ -54,7 +54,6 @@
androidXMultiplatform {
android()
- androidNative()
ios() {
// Link to sqlite3 available in iOS
binaries.all {
diff --git a/sqlite/sqlite/build.gradle b/sqlite/sqlite/build.gradle
index 9a1b291..ce04df8 100644
--- a/sqlite/sqlite/build.gradle
+++ b/sqlite/sqlite/build.gradle
@@ -34,7 +34,6 @@
androidXMultiplatform {
android()
- androidNative()
ios()
jvm()
linux()
