Merge "Upgrade to NDK r25" into androidx-main

diff --git a/buildSrc/private/src/main/kotlin/androidx/build/InspectionRelease.kt b/buildSrc/private/src/main/kotlin/androidx/build/InspectionRelease.kt
index 105de69..0ebceab 100644
--- a/buildSrc/private/src/main/kotlin/androidx/build/InspectionRelease.kt
+++ b/buildSrc/private/src/main/kotlin/androidx/build/InspectionRelease.kt

@@ -16,6 +16,7 @@
 
 package androidx.build
 
+import androidx.inspection.gradle.InspectionExtension
 import androidx.inspection.gradle.InspectionPlugin
 import androidx.inspection.gradle.createConsumeInspectionConfiguration
 import androidx.inspection.gradle.createConsumeNonDexedInspectionConfiguration
@@ -56,10 +57,9 @@
             it.sourceFile = project.provider {
                 project.files(configuration).singleFile
             }
-            it.destinationFile = File(
-                File(getDistributionDirectory(), dirName),
-                "${project.name}.jar"
-            )
+            val extension = project.extensions.getByType(InspectionExtension::class.java)
+            val fileName = extension.name ?: "${project.name}.jar"
+            it.destinationFile = File(File(getDistributionDirectory(), dirName), fileName)
         }
     addToBuildOnServer(sync)
 }