tree b678bbaaca59edbe12587a2e89d370b21cfc9a65
parent aeeafbd459298788c7760f35d04e7c0568d192b5
author Paul Duffin <paulduffin@google.com> 1671631437 +0000
committer Alexander Martinz <alex@amartinz.at> 1722535832 +0200
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEpJShu+9pnB0vSPYRH4MFVmchqx4FAmarz5gACgkQH4MFVmch
 qx4XFg//b2I3EUBF/9xT3/t0TtX1hqONlrDnhZKAE6hMAVG3m0hf2Uj0pAD2sexY
 r3QSYL9BSN3dTos/AxmrEqgJPy4IMWZNoN6WZ+MKmQCvI2Jztiw7REHUIMjL54pQ
 rlSPGyhxRn2hMHmebQOOD7Kr5uujYVubUpmnd5ItOT503/R5fkNEKv5XdQuRGEZP
 csitHY+T24PFrp2ZxaJlj4dkR1h14+Gtd7zV4fK1Lr3STvAOU97gxgabHvTyltcz
 fYj1Pfr0+qpwGbFLmPDd56Knd1mrS3UvAMv5sp7kiIwstb7mRcv2v9EHS5e0/Vuj
 PAcMNCRKvXuIhF4owJlp9HrP/xbycduxeIBih5ycWQUBMKg0JNURkveJlOd8WOHh
 63zZ/cjDd1SiKTebVVKzcqQ8kpIlt1PISb5yzzCD57KzVCAwe4EUv4WLNtKsjZYz
 bK6Z9E9bXx3Fpq+OiRUgc4tnGp3CnyQ3oPu6x34iJXfSz/+U6W6twamR6w848+t0
 MfKGp7l0BoOXIqKZponrfcVAIi7asPybLVvFmHxJJGY6ZV/glEgV3YO9XsQvWI0c
 8VLmfy6Hd9bO4+rYrCceLuw+FwU6SX7HQg+Qnfh/+2SvYWjm8sPadgFlB8WRCFHY
 mdOItnELTQdNoTpUu54h57uSq5KaGe6MK3D/IiWchpoQpa8mR9s=
 =oCCI
 -----END PGP SIGNATURE-----

DO NOT MERGE: Make veridex resolve API conflicts in favor of most accessible

Previously, if veridex was using a hidden APi flags file
(out/soong/hiddenapi/hiddenapi-flags.csv) that was generated from both
source and prebuilt APIs it would abort if an API element had
conficting flags, e.g. `whitelist` and `greylist`. That would happen
when attempting to build in R against prebuilts that contained updated
.apks and SDK files. That was because the hidden API flag handling was
not modularized until the S build.

This change fixes the R veridex tool to handle the conflicting flags
by selecting the most accessible, e.g. if the conflicting flags were
`whitelist` and `greylist` then merging them would use the `whitelist`
flag as that API is more accessible than the `greylist` API. That
behavior was chosen on the assumption that in order to preserve
backwards compatibility an API would never become less accessible so
if an API element has two conflicting flags then that is because the
API has been made more accessible in the prebuilts. e.g. the
`android.net.wifi.WifiConfiguration#lastConnectUid` was previously part
of the `greylist` but has since been added to the system API and so is
now part of the `whitelist` API.

Bug: 253335210
Test: build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=aosp_cf_x86_64_phone TARGET_BUILD_VARIANT=userdebug droid dist
      # First, reproduce the build failure so that the above fails in
      # veridex due to conflicting flags. See the bug for detailed
      # instructions on how to reproduce the initial build failure.
      # Second, apply this change and rerun to make sure that it is
      # fixed.
Change-Id: Ibda4443baa9aaed540e16dc9b325d843df37a29c