commit 18024624b85ce80d0543eb6f720a2ef04c7c1a0c
author Paul Duffin <paulduffin@google.com> Thu Apr 25 17:46:33 2024 +0100
committer Paul Duffin <paulduffin@google.com> Thu Apr 25 17:49:15 2024 +0100
tree eab823530c673c3ce9934dc3aa5bdea21b816c20
parent cbc76a5249b4c2696cbcf123e02f088b03ff3123

Match any API surface in the SDK extension directory

Previously, it would only match `public`, this allows it to match any
API surface.

Bug: 336993217
Test: ./gradlew
Change-Id: I80a687fc43e53bafc251459b914d1e2c1a0a623f

metalava/src/main/java/com/android/tools/metalava/apilevels/ExtensionSdkJarReader.kt

diff --git a/metalava/src/main/java/com/android/tools/metalava/apilevels/ExtensionSdkJarReader.kt b/metalava/src/main/java/com/android/tools/metalava/apilevels/ExtensionSdkJarReader.kt
index e840390..fa6a8ef 100644
--- a/metalava/src/main/java/com/android/tools/metalava/apilevels/ExtensionSdkJarReader.kt
+++ b/metalava/src/main/java/com/android/tools/metalava/apilevels/ExtensionSdkJarReader.kt
@@ -23,7 +23,7 @@
 
     companion object {
         private val REGEX_JAR_PATH = run {
-            var pattern = ".*/(\\d+)/public/(.*)\\.jar$"
+            var pattern = ".*/(\\d+)/[^/]+/(.*)\\.jar$"
             if (SdkConstants.currentPlatform() == PLATFORM_WINDOWS) {
                 pattern = pattern.replace("/", "\\\\")
             }