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 5fb67bedab..9e6a6e334a 100644 --- a/tools/check-flagged-apis/src/com/android/checkflaggedapis/CheckFlaggedApisTest.kt +++ b/tools/check-flagged-apis/src/com/android/checkflaggedapis/CheckFlaggedApisTest.kt @@ -52,6 +52,18 @@ private val PARSED_FLAGS = ByteArrayInputStream(binaryProto.toByteArray()) }() +private val API_VERSIONS = + """ + + + + + + + +""" + .trim() + @RunWith(DeviceJUnit4ClassRunner::class) class CheckFlaggedApisTest : BaseHostJUnit4Test() { @Test @@ -67,4 +79,11 @@ class CheckFlaggedApisTest : BaseHostJUnit4Test() { val actual = parseFlagValues(PARSED_FLAGS) assertEquals(expected, actual) } + + @Test + fun testParseApiVersions() { + val expected: Set = setOf(Symbol("android.Clazz.FOO")) + val actual = parseApiVersions(API_VERSIONS.byteInputStream()) + assertEquals(expected, actual) + } } diff --git a/tools/check-flagged-apis/src/com/android/checkflaggedapis/Main.kt b/tools/check-flagged-apis/src/com/android/checkflaggedapis/Main.kt index 005f6c0fb8..e7eff176be 100644 --- a/tools/check-flagged-apis/src/com/android/checkflaggedapis/Main.kt +++ b/tools/check-flagged-apis/src/com/android/checkflaggedapis/Main.kt @@ -28,6 +28,8 @@ import com.github.ajalt.clikt.parameters.options.option import com.github.ajalt.clikt.parameters.options.required import com.github.ajalt.clikt.parameters.types.path import java.io.InputStream +import javax.xml.parsers.DocumentBuilderFactory +import org.w3c.dom.Node /** * Class representing the fully qualified name of a class, method or field. @@ -108,6 +110,16 @@ The tool will exit with a non-zero exit code if any flagged APIs are found to be """) .path(mustExist = true, canBeDir = false, mustBeReadable = true) .required() + private val apiVersionsPath by + option("--api-versions") + .help( + """ + Path to API versions XML file. + Usually named xml-versions.xml. + Tip: `m sdk dist` will generate a file that includes all platform and mainline APIs. + """) + .path(mustExist = true, canBeDir = false, mustBeReadable = true) + .required() override fun run() { @Suppress("UNUSED_VARIABLE") @@ -117,6 +129,8 @@ The tool will exit with a non-zero exit code if any flagged APIs are found to be } @Suppress("UNUSED_VARIABLE") val flags = flagValuesPath.toFile().inputStream().use { parseFlagValues(it) } + @Suppress("UNUSED_VARIABLE") + val exportedSymbols = apiVersionsPath.toFile().inputStream().use { parseApiVersions(it) } throw ProgramResult(0) } } @@ -151,4 +165,24 @@ internal fun parseFlagValues(input: InputStream): Map { { it.getState() == Aconfig.flag_state.ENABLED }) } +internal fun parseApiVersions(input: InputStream): Set { + fun Node.getAttribute(name: String): String? = getAttributes()?.getNamedItem(name)?.getNodeValue() + + val output = mutableSetOf() + val factory = DocumentBuilderFactory.newInstance() + val parser = factory.newDocumentBuilder() + val document = parser.parse(input) + val fields = document.getElementsByTagName("field") + // ktfmt doesn't understand the `..<` range syntax; explicitly call .rangeUntil instead + for (i in 0.rangeUntil(fields.getLength())) { + val field = fields.item(i) + val fieldName = field.getAttribute("name") + val className = + requireNotNull(field.getParentNode()) { "Bad XML: top level element" } + .getAttribute("name") + output.add(Symbol.create("$className.$fieldName")) + } + return output +} + fun main(args: Array) = CheckCommand().main(args)