Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Unverified Commit 28fecae8 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-13.0.0_r35' into staging/lineage-20.0_merge-android-13.0.0_r35

Android 13.0.0 release 35

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZA9jqQAKCRDorT+BmrEO
# eLo/AJ9Y8Q31v7Vs/rPe5Ap0pweF8K3eDQCfVKaeCeF5KGE9kRQWBdM7j/zfA4I=
# =gDpX
# -----END PGP SIGNATURE-----
# gpg: Signature made Mon Mar 13 19:55:53 2023 EET
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal]
# gpg: initial-contribution@android.com: Verified 1575 signatures in the past
#      16 months.  Encrypted 4 messages in the past 14 months.
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4340 D135 70EF 945E 8381  0964 E8AD 3F81 9AB1 0E78

# By Rex Hoffman (3) and others
# Via Android Build Coastguard Worker (14) and others
* tag 'android-13.0.0_r35':
  Revert^3 "Revert "update MultiAbiTargeting matching logic""
  Revert^2 "Revert "update MultiAbiTargeting matching logic""
  Revert "Revert "update MultiAbiTargeting matching logic""
  Support robolectric zip expectations (similar to command line zip)
  Support robolectric zip expectations (similar to command line zip)
  Enable new_robolectric
  Add support for pom with packaging=apk to pom2bp.
  Add support for prepending text from a file
  Add kotlinx.coroutines to "neverallow" allowlist
  Use the current java version for -jvm-target
  Revert "update MultiAbiTargeting matching logic"
  update MultiAbiTargeting matching logic
  Treat kotlin-annotations the same as kotlin-stdlib
  Allow BoringSSL's Rust bindings to build

Change-Id: I059c901cf46cbcb2ff2f099a4d04e4bd597a3259
parents 0493b450 16a9b3d3
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment