Skip to content

Commit eb7fdf7

Browse files
authored
[api-merge] Update "constant" values to mirror latest API levels (#9004)
Context: #9000 Context: ac3b405 In Issue #9000, we learned that: - Constant values can change between Android API levels - `api-merge` does not update constant values in the final `api.xml` if they do change Update `api-merge` to update constant values if they change, and update `api-VanillaIceCream.xml` with the new `api-merge` logic.
1 parent ac3b405 commit eb7fdf7

File tree

4 files changed

+26
-19
lines changed

4 files changed

+26
-19
lines changed

build-tools/api-merge/ApiDescription.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,9 @@ public void Merge (XDocument n, string apiLocation)
147147
}
148148
*/
149149

150+
// Yes, "constant" values can change between API levels.
151+
smember.SetAttributeValue ("value", nmember.Attribute ("value")?.Value);
152+
150153
UpdateDeprecatedSince (smember, nmember, platform);
151154

152155
#if KEEP_OLD_WRONG_COMPATIBILITY

0 commit comments

Comments
 (0)