-----BEGIN PGP SIGNATURE----- iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ1IssQAKCRDorT+BmrEO eCMSAJ95Nymz4O8Ns1Qme+Oncb7Gdsw8ZQCgjiQ4o4/XgQKsvMhu4CkNmJsyXl8= =IOWw -----END PGP SIGNATURE----- gpgsig -----BEGIN PGP SIGNATURE----- iQJLBAABCgA1FiEEHrBYPudH862glXQBzJUERRm+ZmkFAmdY7msXHG1rYmVzdGFz QGxpbmVhZ2Vvcy5vcmcACgkQzJUERRm+ZmkRWhAAutEXt5UqQlI72nkMLAEz9IX2 RG7M4H6FFmnoKQ9JRxzosrllYpX4MgQInO09QBBFkX6cmAdO1/TtIlDpHa8M7w8D KTp/bcIVeDr+BzoqUWv3/yf11FSKN6PeNU64mIxKCj7OtQ0ujVRHZimlzCA4hWVU lZrcUnYDwRu5xb5fgsQGuK3rsonH0GiKwvuEbnPJh1wFwtCdrLQR39hSPU3Dg3om UKEGUBk0SN0bAtMarjRqjwABZR/wcD/BzmeR0Y2tdAm+r/mnBTesbF9PKIUudRzm qEBaIdL5SA4TQ9RqFufhPzkd5b12iYd8UQwEkLlIAYtuOVjUVgVajCse7Lp1Us1x Ldadcg+OEMrJXnp2W0jBi+J4AzL/m2cR++bkfka7B2DQxfsC763b/bylVT4Vu3Q9 vni9BFGZqvUekbItjS2/6Apbs7i0i7cDlRSLNAb1DCDW68mbhiY3RvboqooP8nGB oqgbvZqDL0lB6j3NagyB2pkFgPo2OvkCEOqIplkRq3Y2ZlaPgRPkIPhbQwE/LkMo r5pU5VYRsgLneo2CIxARAJARJlFlkaFXn1Ccw2wEzAeNO7WV2aVTMMTW+NgMt9zm 49Z6msmEXG0S4jxU+TXvRR5XSlTGDTzudICzSutHWWCADTyn0IHl7yrEc4RoTN75 U+KlNzIlop42k34B0kw= =+IPt -----END PGP SIGNATURE----- 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 # eCMSAJ95Nymz4O8Ns1Qme+Oncb7Gdsw8ZQCgjiQ4o4/XgQKsvMhu4CkNmJsyXl8= # =IOWw # -----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 2483 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 Per Åhgren (9) and others # Via Android (Google) Code Review (78) and others * tag 'android-15.0.0_r6': (111 commits) gps: Update official release 4.15.3_7_241024_R1 config on P24 powerhint: enable auto_prefer_idle in games caimito: fix unexpected affinity setting. Add Sony WF-1000XM5 to the LE audio allow list tokay: Update APMg3 tuning files caiman: Update APMg3 tuning files komodo: Update APMg3 tuning files bthal: disable thread dispatcher gps: Update L5 Path Delay Parameters for P24 komodo: Update APMg3 tuning files caiman: Update APMg3 tuning files tokay: Update APMg3 tuning files caimito: fix bypass mode creation flow Revert^2 "Move PRODUCT_SHIPPING_API_LEVEL to define by device" 16kb: Set data partition to f2fs for 16kb aosp caimito targets only gps: Update official release 4.15.3_6_240905_R2 config thread: disable hal service gps: Remove ENABLE_CAPS_OTDOA to enable OTDOA in VZW network. Update product id for Caiman, Komodo and Tokay Symlink current prebuilt folder to android root ... Conflicts: device-caiman.mk device-komodo.mk device-tokay.mk Change-Id: I590408c74ef4bcc68613966602af3cb781eb702d
45 lines
1.7 KiB
Makefile
45 lines
1.7 KiB
Makefile
#
|
|
# Copyright (C) 2019 The Android Open-Source Project
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
#
|
|
|
|
PRODUCT_MAKEFILES := \
|
|
$(LOCAL_DIR)/aosp_caiman.mk \
|
|
$(LOCAL_DIR)/aosp_caiman_16k.mk \
|
|
$(LOCAL_DIR)/aosp_caiman_fullmte.mk \
|
|
$(LOCAL_DIR)/factory_caiman.mk \
|
|
$(LOCAL_DIR)/aosp_komodo.mk \
|
|
$(LOCAL_DIR)/aosp_komodo_16k.mk \
|
|
$(LOCAL_DIR)/aosp_komodo_fullmte.mk \
|
|
$(LOCAL_DIR)/factory_komodo.mk \
|
|
$(LOCAL_DIR)/aosp_ripcurrentpro.mk \
|
|
$(LOCAL_DIR)/aosp_ripcurrentpro_fullmte.mk \
|
|
$(LOCAL_DIR)/factory_ripcurrentpro.mk \
|
|
$(LOCAL_DIR)/aosp_ripcurrent24.mk \
|
|
$(LOCAL_DIR)/aosp_ripcurrent24_fullmte.mk \
|
|
$(LOCAL_DIR)/factory_ripcurrent24.mk \
|
|
$(LOCAL_DIR)/aosp_tokay.mk \
|
|
$(LOCAL_DIR)/aosp_tokay_16k.mk \
|
|
$(LOCAL_DIR)/aosp_tokay_fullmte.mk \
|
|
$(LOCAL_DIR)/factory_tokay.mk \
|
|
$(LOCAL_DIR)/lineage_caiman.mk \
|
|
$(LOCAL_DIR)/lineage_komodo.mk \
|
|
$(LOCAL_DIR)/lineage_tokay.mk
|
|
|
|
COMMON_LUNCH_CHOICES := \
|
|
aosp_caiman-trunk_staging-userdebug \
|
|
aosp_komodo-trunk_staging-userdebug \
|
|
aosp_ripcurrentpro-trunk_staging-userdebug \
|
|
aosp_ripcurrent24-trunk_staging-userdebug \
|
|
aosp_tokay-trunk_staging-userdebug
|