| commit | 98c1655896f52822d4c2a4ded33c8e5704238f75 | [log] [tgz] |
|---|---|---|
| author | Michael Bestas <mkbestas@lineageos.org> | Tue Dec 10 23:09:18 2024 +0200 |
| committer | Michael Bestas <mkbestas@lineageos.org> | Tue Dec 10 23:09:18 2024 +0200 |
| tree | 576f9e0c7c4786de71d0c20a327f590646efa065 | |
| parent | 0fe41564a389a6aa14b740c7d9332c6b89e82456 [diff] | |
| parent | 910fc4b0a7282c6fcdfd4fc971149e7f685b361c [diff] |
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+BmrEOeAUCZ1IssgAKCRDorT+BmrEO # eMnTAJ0WqPXhGqlukPWjtdbffpwES/OgvACfZfv7vak9Lgex8R6zONV9iZzQ+gw= # =vYjQ # -----END PGP SIGNATURE----- # gpg: Signature made Fri Dec 6 00:44:02 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 2473 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 Anvesh Renikindi (9) and others # Via Automerger Merge Worker (120) and others * tag 'android-15.0.0_r6': (69 commits) Revert "add new dependency" add new dependency Add android.hardware.wifi.supplicant-V4-java to allowed_deps Add android.hardware.wifi.supplicant-V4-java to allowed_deps [Ranging] Add framework-ranging to allowed deps min_sdk_version of tempfile increased. build/allowed_deps.txt: add libaom_sve2 build/allowed_deps.txt: add libaom_sve build/allowed_deps.txt: add libaom_neon_i8mm The new version of tempfile has some new dependencies. Added gson deps for Adservices wifi: Upgrade hostapd/vendor HAL aidl version Allow exporting app function flags for PermissionController Update allow_deps.txt for ipmemorystore-aidl-interfaces-V11-java Make java_sdk_library dependencies explicit Adapt to module rename. Revert "build/allowed_deps.txt: add libaom_neon_i8mm" Add mainline modules apex_defaults for b-launched-apex-module Allow VDM aconfig flag Add networkstack-aidl-interfaces-V22-java to allowed_deps. ... Conflicts: build/allowed_deps.txt Change-Id: I58435a885a7179ae37125f10241f85f6e5fdce89
This project includes mainline build and other utility code. Any library code intended for use by modules should go in frameworks/libs/modules-utils instead.
This project uses a single source path for java code. All java code should go in the java directory with subdirectories corresponding to the java package. Android.bp files should go alongside the java source files, and should only include java source for a single java package to encourage good code hygiene.
Tests for java code should go in the javatests directory and follow the same structure.