diff options
| author | Makoto Onuki <omakoto@google.com> | 2020-06-10 19:00:14 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-10 19:00:14 +0000 |
| commit | 24ee537339e7c3459a0a5d424c9c12e21c8d3cdf (patch) | |
| tree | 81fe179e6b8190a6be49b490f9334d8edd7f6040 | |
| parent | f334ffad1eb3b2e5df5364e3971965b1d192cc13 (diff) | |
| parent | c1963f8898b3f714f475363ba068716cc757e139 (diff) | |
Metalava: Mark enum fields in JDiff XML am: 943b1b20fc am: c1963f8898
Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/metalava/+/11813945
Change-Id: I9fbd530342e740f0a3bba63efc592f6e7d41f35a
| -rw-r--r-- | src/main/java/com/android/tools/metalava/JDiffXmlWriter.kt | 9 | ||||
| -rw-r--r-- | src/test/java/com/android/tools/metalava/JDiffXmlTest.kt | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/main/java/com/android/tools/metalava/JDiffXmlWriter.kt b/src/main/java/com/android/tools/metalava/JDiffXmlWriter.kt index 8087c3f..47bda71 100644 --- a/src/main/java/com/android/tools/metalava/JDiffXmlWriter.kt +++ b/src/main/java/com/android/tools/metalava/JDiffXmlWriter.kt @@ -224,9 +224,12 @@ class JDiffXmlWriter( writer.print(deprecation(field)) writer.print("\"\n visibility=\"") writer.print(modifiers.getVisibilityModifiers()) - writer.println("\"\n>") - - writer.println("</field>") + writer.print("\"") + if (field.isEnumConstant()) { + // Metalava extension. JDiff doesn't support it. + writer.print("\n metalava:enumConstant=\"true\"") + } + writer.println("\n>\n</field>") } override fun visitProperty(property: PropertyItem) { diff --git a/src/test/java/com/android/tools/metalava/JDiffXmlTest.kt b/src/test/java/com/android/tools/metalava/JDiffXmlTest.kt index e76933e..633c49f 100644 --- a/src/test/java/com/android/tools/metalava/JDiffXmlTest.kt +++ b/src/test/java/com/android/tools/metalava/JDiffXmlTest.kt @@ -457,6 +457,7 @@ class JDiffXmlTest : DriverTest() { final="true" deprecated="not deprecated" visibility="public" + metalava:enumConstant="true" > </field> <field name="B" @@ -467,6 +468,7 @@ class JDiffXmlTest : DriverTest() { final="true" deprecated="not deprecated" visibility="public" + metalava:enumConstant="true" > </field> </class> |