metalava: Update sdk paths to match new layout of prebuilts/sdk.
The android.jar and txt files have been copied to new locations. Update
metalava to use the new files so that the old ones can be deleted.
Note: ./gradlew test fails, but I think for unrelated reasons:
javadoc: option --boot-class-path not allowed with target 1.9
Bug: 77525052
Test: ./gradlew test
Change-Id: I4d372b9f446d5d41f6e2e699cef72ca85e0abd48
diff --git a/src/main/java/com/android/tools/metalava/Options.kt b/src/main/java/com/android/tools/metalava/Options.kt
index 5894229..b2a08ab 100644
--- a/src/main/java/com/android/tools/metalava/Options.kt
+++ b/src/main/java/com/android/tools/metalava/Options.kt
@@ -808,7 +808,7 @@
if (androidJarPatterns == null) {
androidJarPatterns = mutableListOf(
"prebuilts/tools/common/api-versions/android-%/android.jar",
- "prebuilts/sdk/%/android.jar"
+ "prebuilts/sdk/%/public/android.jar"
)
}
apiLevelJars = findAndroidJars(androidJarPatterns!!, currentApiLevel, currentCodeName, currentJar)
diff --git a/src/main/java/com/android/tools/metalava/apilevels/ApiGenerator.java b/src/main/java/com/android/tools/metalava/apilevels/ApiGenerator.java
index 56fc22c..ca741a5 100644
--- a/src/main/java/com/android/tools/metalava/apilevels/ApiGenerator.java
+++ b/src/main/java/com/android/tools/metalava/apilevels/ApiGenerator.java
@@ -167,7 +167,7 @@
private static void printUsage() {
System.err.println("\nGenerates a single API file from the content of an SDK.");
System.err.println("Usage:");
- System.err.println("\tApiCheck [--min-api=1] OutFile [SdkFolder | --pattern sdk/%/android.jar]+");
+ System.err.println("\tApiCheck [--min-api=1] OutFile [SdkFolder | --pattern sdk/%/public/android.jar]+");
System.err.println("Options:");
System.err.println("--min-api <int> : The first API level to consider (>=1).");
System.err.println("--pattern <pattern>: Path pattern to find per-API android.jar files, where\n" +
diff --git a/src/test/java/com/android/tools/metalava/CompatibilityCheckTest.kt b/src/test/java/com/android/tools/metalava/CompatibilityCheckTest.kt
index 7f6cf92..10cb415 100644
--- a/src/test/java/com/android/tools/metalava/CompatibilityCheckTest.kt
+++ b/src/test/java/com/android/tools/metalava/CompatibilityCheckTest.kt
@@ -1465,7 +1465,7 @@
// Check signature file checks. We have .txt files for API level 14 and up, but there are a
// BUNCH of problems in older signature files that make the comparisons not work --
// missing type variables in class declarations, missing generics in method signatures, etc.
- val signatureFile = File("../../prebuilts/sdk/api/${apiLevel - 1}.txt")
+ val signatureFile = File("../../prebuilts/sdk/${apiLevel - 1}/public/api/android.txt")
if (!(signatureFile.isFile)) {
println("Couldn't find $signatureFile: Check that pwd for test is correct. Skipping this test.")
return
@@ -1492,4 +1492,4 @@
// TODO: Check method signatures changing incompatibly (look especially out for adding new overloaded
// methods and comparator getting confused!)
// ..equals on the method items should actually be very useful!
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/android/tools/metalava/DriverTest.kt b/src/test/java/com/android/tools/metalava/DriverTest.kt
index 2e00525..a2f4893 100644
--- a/src/test/java/com/android/tools/metalava/DriverTest.kt
+++ b/src/test/java/com/android/tools/metalava/DriverTest.kt
@@ -1002,7 +1002,7 @@
)
fun getAndroidJar(apiLevel: Int): File? {
- val localFile = File("../../prebuilts/sdk/$apiLevel/android.jar")
+ val localFile = File("../../prebuilts/sdk/$apiLevel/public/android.jar")
if (localFile.exists()) {
return localFile
}
diff --git a/src/test/java/com/android/tools/metalava/apilevels/ApiGeneratorTest.kt b/src/test/java/com/android/tools/metalava/apilevels/ApiGeneratorTest.kt
index 9ec985f..8ea2750 100644
--- a/src/test/java/com/android/tools/metalava/apilevels/ApiGeneratorTest.kt
+++ b/src/test/java/com/android/tools/metalava/apilevels/ApiGeneratorTest.kt
@@ -51,7 +51,7 @@
"--android-jar-pattern",
"${oldSdkJars.path}/android-%/android.jar",
"--android-jar-pattern",
- "${platformJars.path}/%/android.jar"
+ "${platformJars.path}/%/public/android.jar"
),
checkDoclava1 = false,
signatureSource = """
@@ -76,4 +76,4 @@
val document = XmlUtils.parseDocumentSilently(xml, false)
assertNotNull(document)
}
-}
\ No newline at end of file
+}