commit ece054c856fa083a343ac13be6e286c6da3853f3
author Mårten Kongstad <amhk@google.com> Thu May 02 09:45:11 2024 +0200
committer Mårten Kongstad <amhk@google.com> Thu May 02 09:50:33 2024 +0200
tree 06f039666770a4dd3e80ad76cce72250bc03d20d
parent 7faf630b7c814ff3590d1cbaf55ed70f019f396e

check-flagged-apis: change internal format

Switch the internal format to represent Symbols to (something close to)
the format described in section 4.3.2 of the JVM spec, i.e.

  com/android/SomeClass/someMethod(II[Ljava/lang/String;)Z

This will make parsing method parameters from api-versions.xml easier,
as that file already uses this format, and converting API signature
files to the same format is less painful than going in the other
direction.

Bug: 334870672
Test: atest --host check-flagged-apis-test
Change-Id: I1e1fb8fe208cd51cce2cc129f5aa1cb495672c16

tools/check-flagged-apis/src/com/android/checkflaggedapis/CheckFlaggedApisTest.kt

diff --git a/tools/check-flagged-apis/src/com/android/checkflaggedapis/CheckFlaggedApisTest.kt b/tools/check-flagged-apis/src/com/android/checkflaggedapis/CheckFlaggedApisTest.kt
index 0569bfd..04c2f80 100644
--- a/tools/check-flagged-apis/src/com/android/checkflaggedapis/CheckFlaggedApisTest.kt
+++ b/tools/check-flagged-apis/src/com/android/checkflaggedapis/CheckFlaggedApisTest.kt
@@ -89,11 +89,11 @@
   fun testParseApiSignature() {
     val expected =
         setOf(
-            Pair(Symbol("android.Clazz"), Flag("android.flag.foo")),
-            Pair(Symbol("android.Clazz.Clazz()"), Flag("android.flag.foo")),
-            Pair(Symbol("android.Clazz.FOO"), Flag("android.flag.foo")),
-            Pair(Symbol("android.Clazz.getErrorCode()"), Flag("android.flag.foo")),
-            Pair(Symbol("android.Clazz.Builder"), Flag("android.flag.bar")),
+            Pair(Symbol("android/Clazz"), Flag("android.flag.foo")),
+            Pair(Symbol("android/Clazz/Clazz()"), Flag("android.flag.foo")),
+            Pair(Symbol("android/Clazz/FOO"), Flag("android.flag.foo")),
+            Pair(Symbol("android/Clazz/getErrorCode()"), Flag("android.flag.foo")),
+            Pair(Symbol("android/Clazz/Builder"), Flag("android.flag.bar")),
         )
     val actual = parseApiSignature("in-memory", API_SIGNATURE.byteInputStream())
     assertEquals(expected, actual)
@@ -111,11 +111,11 @@
   fun testParseApiVersions() {
     val expected: Set<Symbol> =
         setOf(
-            Symbol("android.Clazz"),
-            Symbol("android.Clazz.Clazz()"),
-            Symbol("android.Clazz.FOO"),
-            Symbol("android.Clazz.getErrorCode()"),
-            Symbol("android.Clazz.Builder"),
+            Symbol("android/Clazz"),
+            Symbol("android/Clazz/Clazz()"),
+            Symbol("android/Clazz/FOO"),
+            Symbol("android/Clazz/getErrorCode()"),
+            Symbol("android/Clazz/Builder"),
         )
     val actual = parseApiVersions(API_VERSIONS.byteInputStream())
     assertEquals(expected, actual)
@@ -136,14 +136,14 @@
   fun testFindErrorsDisabledFlaggedApiIsPresent() {
     val expected =
         setOf<ApiError>(
-            DisabledFlaggedApiIsPresentError(Symbol("android.Clazz"), Flag("android.flag.foo")),
+            DisabledFlaggedApiIsPresentError(Symbol("android/Clazz"), Flag("android.flag.foo")),
             DisabledFlaggedApiIsPresentError(
-                Symbol("android.Clazz.Clazz()"), Flag("android.flag.foo")),
-            DisabledFlaggedApiIsPresentError(Symbol("android.Clazz.FOO"), Flag("android.flag.foo")),
+                Symbol("android/Clazz/Clazz()"), Flag("android.flag.foo")),
+            DisabledFlaggedApiIsPresentError(Symbol("android/Clazz/FOO"), Flag("android.flag.foo")),
             DisabledFlaggedApiIsPresentError(
-                Symbol("android.Clazz.getErrorCode()"), Flag("android.flag.foo")),
+                Symbol("android/Clazz/getErrorCode()"), Flag("android.flag.foo")),
             DisabledFlaggedApiIsPresentError(
-                Symbol("android.Clazz.Builder"), Flag("android.flag.bar")),
+                Symbol("android/Clazz/Builder"), Flag("android.flag.bar")),
         )
     val actual =
         findErrors(