Skip to content

Commit

Permalink
[api-merge] Update "constant" values to mirror latest API levels (#9004)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
jpobst authored Jun 7, 2024
1 parent ac3b405 commit eb7fdf7
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 19 deletions.
3 changes: 3 additions & 0 deletions build-tools/api-merge/ApiDescription.cs
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,9 @@ public void Merge (XDocument n, string apiLocation)
}
*/

// Yes, "constant" values can change between API levels.
smember.SetAttributeValue ("value", nmember.Attribute ("value")?.Value);

UpdateDeprecatedSince (smember, nmember, platform);

#if KEEP_OLD_WRONG_COMPATIBILITY
Expand Down
Loading

0 comments on commit eb7fdf7

Please sign in to comment.