Merge tag 'android-15.0.0_r6' into staging/lineage-22.0_merge-android-15.0.0_r6
Android 15.0.0 Release 6 (AP4A.241205.013) # -----BEGIN PGP SIGNATURE----- # # iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ1IssQAKCRDorT+BmrEO # eICmAJ4ucooPI46WmQPpM0P59O1mMg6tTQCeN/GI0UvgsQkpgB52QWP9VGXeRg8= # =mAzQ # -----END PGP SIGNATURE----- # gpg: Signature made Fri Dec 6 00:44:01 2024 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 2457 signatures in the past # 3 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 Spandan Das (55) and others # Via Automerger Merge Worker (1031) and others * tag 'android-15.0.0_r6': (554 commits) Revert^3 "Use -target-feature for MTE" Enforce exclusive release config component directories Possible fix for stat error during globbing Remove `prebuilt_apex_module_creator` mutator Revert "pass read new storage parameter to java codegen" Temporarily bypass apex availability check for /product apexes with a specific prefix Remove the internal extractor module created by apex_set Remove the internal selector module created by prebuilt_apex pass read new storage parameter to java codegen Add an incremental parity test. Remove internal deapexer module Remove deapex support from java_*_import Revert^2 "Remove java_sdk_library "magic"" Revert^2 "Restrict java_sdk_library in libs of java_import and droidstubs modules" Revert^2 "Restrict java_sdk_library in libs" Revert "Remove java_sdk_library "magic"" Revert "Restrict java_sdk_library in libs of java_import and dro..." Revert "Restrict java_sdk_library in libs" Fixes host_required_modules for test_module_config Add some log to the build action caching test. ... Conflicts: android/Android.bp android/androidmk.go android/config.go android/defaults.go android/module.go android/module_context.go android/neverallow.go android/product_config.go android/sdk.go android/variable.go apex/apex.go cc/binary_sdk_member.go cc/cc.go cc/compiler.go cc/library.go cc/library_sdk_member.go cc/linker.go cc/object.go java/java.go scripts/gen_build_prop.py snapshot/host_fake_snapshot.go snapshot/host_snapshot.go Change-Id: I036e0ef3652f680f194dcf11e5a36844bd527221
Loading
Please register or sign in to comment