Skip to content
Unverified Commit 239d7508 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-14.0.0_r50' into staging/lineage-21.0_merge-android-14.0.0_r50

Android 14.0.0 Release 50 (AP2A.240605.024)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZmdzmgAKCRDorT+BmrEO
# eH6BAJ4lHyjAGMVjWnJenXtnUQ3eJVn8pgCdHI14jGLDS19WCK0/rQq/nwxu38M=
# =iRUk
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue Jun 11 00:43:54 2024 EEST
# 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 2466 signatures in the past
#      2 years.  Encrypted 4 messages in the past 2 years.
# 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 Colin Cross (54) and others
# Via Automerger Merge Worker (704) and others
* tag 'android-14.0.0_r50': (355 commits)
  release-config: sync from goog/main
  Merge "Add secretkeeper-v1-java to platform APIs" into main am: f28b5697b8 am: 196729ffda
  Create rule to generate the exportable api files when checkapi is disabled
  Revert "Additional cleanup prior to adding the runtime stubs"
  Revert "Generate runtime stubs in droidstubs"
  Support partial module variants with apex_contributions
  Fix non-determinism in prebuilt selection
  Use BaseModuleName for LOCAL_MODULE
  Disable source javalib dexpreopt when using prebuilt apex
  Allow clippy::disallowed_names since it can be used for debugging
  Add the build flags for apex contribution contents
  Add a source_module_name to android_app
  Revert "Fix non-determinism in prebuilt selection"
  Fix non-determinism in prebuilt selection
  Copy imported APKs to output filename
  disablePrebuilt: also clear sanitizer-dependent Srcs
  Define libc++ config macros to nothing
  Remove --multitree-build
  Some tweaks to the aconfig flag collection logic
  Use R.txt files from aar files directly
  ...

 Conflicts:
	android/allowlists/allowlists.go
	androidmk/androidmk/android.go
	apex/apex.go
	etc/prebuilt_etc.go
	java/android_manifest.go

Change-Id: I5294562126628c0a9917f145ed933b6b13c05b3d
parents 743a2195 8bf89894
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment