523d38ff3c
-----BEGIN PGP SIGNATURE----- iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ1IssQAKCRDorT+BmrEO eNGxAKCRv3bjgHcOEQjVsHW2ngqYmpsq4QCfejuzhueEquVmLXY/t6cNVe/FF4A= =6wuL -----END PGP SIGNATURE----- gpgsig -----BEGIN PGP SIGNATURE----- iQJLBAABCgA1FiEEHrBYPudH862glXQBzJUERRm+ZmkFAmdY7DcXHG1rYmVzdGFz QGxpbmVhZ2Vvcy5vcmcACgkQzJUERRm+ZmnjOg/+NeluPk0Ydoz47zbXHKNPD7Mr Q2VybclFjaNIbmmtQwNYx/95S0clX+aoAyS9/WFAMpKpNVhKWWMBy1UXDtZlEka5 BA7FeJyb//ba5skMdrTxLfGtReTPzr8OcUh/F/1U+KT77uMnUX71Yq7oOrsnLSen Ij4bSMF3q1KWuR/xmLmJIl7t+u+bp2pHP1fteu2twJmz1ncbWTw6OxUl5VCquqsN BdbF2gCR4abVE7jJD6VEJS9nwJcXoa1gdt4y9ARDBMkcRQxvRES1p5Ezz32dSwgt F5VfXwydre2fTVL6VxMXHVcTVig0TAlkpa1Inuu94ElQg6mVK5sGh7ZwhE+gCZ4P wrElzU6mFc61VfFEdAnXkFHOW+eFw4FC5yiPhJjxqLbge8FBeVZczE9Fqhu/UxPu fA3taBNLchVb/qvl/WQtwI8HJz6kcoMFs2+WHak89PP9PLzBtC9YxtJQBKPXZLQt p3jk8+zEyRTFJMIyvKdscHjUYoWvmUHsmPNgGccSWRxPrIB6SPbGYyVDny+43Q1I StqVesNw55fqq68eIZWNwqm0w+EtVzvt8e6SFYx4of6nnr4S+xtAjbJ+MEhsusRk /IVblc3tkJ+WtiIUZQShbs0aMquOSpcS6dfT3uf+6i3fEp+mfCYMRa+OK3Xse8/U 0VrOzjzNkfNvto5FJAw= =IoQL -----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 # eNGxAKCRv3bjgHcOEQjVsHW2ngqYmpsq4QCfejuzhueEquVmLXY/t6cNVe/FF4A= # =6wuL # -----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 James Huang (8) and others # Via Android Build Coastguard Worker (62) and others * tag 'android-15.0.0_r6': (92 commits) gps: Update official release 4.15.3_7_241024_R1 config on CT3 powerhint: enable auto_prefer_idle in games powerhint: port dvfs_headroom settings from p24 powerhint.json: enable gpu capacity signalling. comet: fix unexpected affinity setting. Adjust power button y value for light reveal Add Sony WF-1000XM5 to the LE audio allow list Display: Removed colordata calibration file from /device BT Offload: Using origin flag to control BT Offload feature bthal: disable thread dispatcher comet: Update APMg3 tuning files Add UWB overlay to comet device gps: Update L5 Path Delay Parameters for CT3 comet: Update APMg3 tuning files comet: fix bypass mode creation flow Revert^2 "Move PRODUCT_SHIPPING_API_LEVEL to define by device" Enable STResetTool on P24 gps: Update official release 4.15.3_6_240905_R2 config add support for bluetooth-low-energy-broadcast thread: disable hal service ... Conflicts: device-comet.mk location/user/gps.cfg location/userdebug/gps.cfg powerhint-comet.json Change-Id: Ic7869348c2d27a7da92371b1f1e3f3728d103460
50 lines
1.8 KiB
Makefile
50 lines
1.8 KiB
Makefile
#
|
|
# Copyright (C) 2020 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.
|
|
#
|
|
ifeq (,$(filter %comet23,$(PRODUCT_NAME)))
|
|
|
|
TARGET_BOARD_INFO_FILE := device/google/comet/board-info.txt
|
|
TARGET_BOOTLOADER_BOARD_NAME := comet
|
|
TARGET_SCREEN_DENSITY := 390
|
|
BOARD_USES_GENERIC_AUDIO := true
|
|
USES_DEVICE_GOOGLE_COMET := true
|
|
|
|
RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_COMET_RADIO_DIR)
|
|
RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_COMET_RADIOCFG_DIR)
|
|
RELEASE_GOOGLE_PRODUCT_NTNRADIO_DIR := $(RELEASE_GOOGLE_COMET_NTNRADIO_DIR)
|
|
|
|
#Display
|
|
USES_IDISPLAY_INTF_SEC := true
|
|
|
|
include device/google/zumapro/BoardConfig-common.mk
|
|
-include vendor/google_devices/zumapro/prebuilts/BoardConfigVendor.mk
|
|
include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk
|
|
-include vendor/google_devices/comet/proprietary/BoardConfigVendor.mk
|
|
include device/google/comet/sepolicy/comet-sepolicy.mk
|
|
include device/google/comet/wifi/BoardConfig-wifi.mk
|
|
|
|
ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
|
|
-include device/google/common/etm/6_1/BoardUserdebugModules.mk
|
|
endif
|
|
|
|
else
|
|
|
|
include device/google/comet23/comet23/BoardConfig.mk
|
|
|
|
endif
|
|
|
|
DEVICE_PATH := device/google/comet
|
|
VENDOR_PATH := vendor/google/comet
|
|
include $(DEVICE_PATH)/$(TARGET_BOOTLOADER_BOARD_NAME)/BoardConfigLineage.mk
|