-----BEGIN PGP SIGNATURE----- iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ8eo7gAKCRDorT+BmrEO eB3lAJ43FQXvW3eB6DBzniiNr0ML+pqVtQCgkcIqEy5+H6nZxj3kgSEogmcFwVg= =3Xk8 -----END PGP SIGNATURE----- gpgsig -----BEGIN SSH SIGNATURE----- U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgPpdpjxPACTIhnlvYz0GM4BR7FJ +rYv3jMbfxNKD3JvcAAAADZ2l0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5 AAAAQEhcXV/yLWqEOQao+l1XN44MwuDJwGxq1FmX+4lDw5b9RCfIx2j0H87G9IWORbcAOa HLIEJ7ok8nVYNcdTiGgQ0= -----END SSH SIGNATURE----- Merge tag 'android-15.0.0_r20' into staging/lineage-22.2_merge-android-15.0.0_r20 Android 15.0.0 Release 20 (BP1A.250305.019) # -----BEGIN PGP SIGNATURE----- # # iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ8eo7gAKCRDorT+BmrEO # eB3lAJ43FQXvW3eB6DBzniiNr0ML+pqVtQCgkcIqEy5+H6nZxj3kgSEogmcFwVg= # =3Xk8 # -----END PGP SIGNATURE----- # gpg: Signature made Wed Mar 5 03:29:18 2025 EET # gpg: using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78 # gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [ultimate] # By Eileen Lai (2) and others # Via Android Build Coastguard Worker (16) and others * tag 'android-15.0.0_r20': modem_svc: use modem_svc_sit version sepolicy Revert "pantah/haptics: Remove voltage restriction for haptics" pantah/haptics: Remove voltage restriction for haptics Update P22 Bluetooth LEA unicast allowlist: Samsung Galaxy Buds 3 pro Disable Wifi BugReport for subsystem restart Update ISODEP routing setting [pantah] Define CAMERA_MULTICAM_BOOST modem_svc: use shared_modem_platform to replace all modem_svc_sit pantah: Pull init.insmod.*.cfg from vendor_dlkm Move modem_svc_sit from gs201 to pantah Remove vibrator HAL service audio: enable software encoded Bluetooth broadcast gps: set default SUPL SSL method to SSLv23 Change-Id: I11328c1fb7e3cadcd70baabdcaaafc2d89f357ec
206 lines
8.4 KiB
Makefile
206 lines
8.4 KiB
Makefile
#
|
|
# Copyright (C) 2021 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.
|
|
#
|
|
|
|
# Restrict the visibility of Android.bp files to improve build analysis time
|
|
$(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk)
|
|
|
|
RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR ?= pdk# Keep this for pdk TODO: b/327119000
|
|
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)
|
|
$(call soong_config_set,pantah_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR))
|
|
ifneq ($(filter trunk%, $(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)),)
|
|
$(call soong_config_set,pantah_fingerprint,prebuilt_dir,trunk)
|
|
else
|
|
$(call soong_config_set,pantah_fingerprint,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR))
|
|
endif
|
|
|
|
|
|
# Keeps flexibility for kasan and ufs builds
|
|
TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_CHEETAH_DIR)
|
|
TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_CHEETAH_DIR)/kernel-headers
|
|
|
|
$(call inherit-product-if-exists, vendor/google_devices/pantah/prebuilts/device-vendor-cloudripper.mk)
|
|
$(call inherit-product-if-exists, vendor/google_devices/gs201/prebuilts/device-vendor.mk)
|
|
$(call inherit-product-if-exists, vendor/google_devices/gs201/proprietary/device-vendor.mk)
|
|
$(call inherit-product-if-exists, vendor/google_devices/pantah/proprietary/cloudripper/device-vendor-cloudripper.mk)
|
|
|
|
include device/google/gs201/device-shipping-common.mk
|
|
include device/google/pantah/audio/cloudripper/audio-tables.mk
|
|
include device/google/gs-common/bcmbt/bluetooth.mk
|
|
include device/google/gs-common/gps/brcm/cbd_gps.mk
|
|
include device/google/gs-common/touch/syna/syna0.mk
|
|
|
|
# go/lyric-soong-variables
|
|
$(call soong_config_set,lyric,camera_hardware,cloudripper)
|
|
$(call soong_config_set,lyric,tuning_product,cloudripper)
|
|
$(call soong_config_set,google3a_config,target_device,cloudripper)
|
|
|
|
# Init files
|
|
PRODUCT_COPY_FILES += \
|
|
device/google/pantah/conf/init.cloudripper.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.cloudripper.rc
|
|
|
|
# Recovery files
|
|
PRODUCT_COPY_FILES += \
|
|
device/google/pantah/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.cloudripper.rc
|
|
|
|
# insmod files. Kernel 5.10 prebuilts don't provide these yet, so provide our
|
|
# own copy if they're not in the prebuilts.
|
|
# TODO(b/369686096): drop this when 5.10 is gone.
|
|
ifeq ($(wildcard $(TARGET_KERNEL_DIR)/init.insmod.*.cfg),)
|
|
PRODUCT_COPY_FILES += \
|
|
device/google/pantah/init.insmod.cloudripper.cfg:$(TARGET_COPY_OUT_VENDOR_DLKM)/etc/init.insmod.cloudripper.cfg
|
|
endif
|
|
|
|
# Camera
|
|
PRODUCT_COPY_FILES += \
|
|
device/google/pantah/media_profiles_cloudripper.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml
|
|
|
|
# NFC
|
|
PRODUCT_COPY_FILES += \
|
|
frameworks/native/data/etc/android.hardware.nfc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.xml \
|
|
frameworks/native/data/etc/android.hardware.nfc.hce.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.hce.xml \
|
|
frameworks/native/data/etc/android.hardware.nfc.hcef.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.hcef.xml \
|
|
frameworks/native/data/etc/com.nxp.mifare.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.nxp.mifare.xml \
|
|
frameworks/native/data/etc/android.hardware.nfc.uicc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.uicc.xml \
|
|
frameworks/native/data/etc/android.hardware.nfc.ese.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.ese.xml \
|
|
device/google/pantah/nfc/libnfc-hal-st.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-hal-st.conf \
|
|
device/google/pantah/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf
|
|
|
|
PRODUCT_PACKAGES += \
|
|
$(RELEASE_PACKAGE_NFC_STACK) \
|
|
Tag \
|
|
android.hardware.nfc-service.st
|
|
|
|
# Shared Modem Platform
|
|
SHARED_MODEM_PLATFORM_VENDOR := lassen
|
|
|
|
# Shared Modem Platform
|
|
include device/google/gs-common/modem/modem_svc_sit/shared_modem_platform.mk
|
|
|
|
# SecureElement
|
|
PRODUCT_PACKAGES += \
|
|
android.hardware.secure_element@1.2-service-gto \
|
|
android.hardware.secure_element@1.2-service-gto-ese2
|
|
|
|
PRODUCT_COPY_FILES += \
|
|
frameworks/native/data/etc/android.hardware.se.omapi.ese.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.se.omapi.ese.xml \
|
|
frameworks/native/data/etc/android.hardware.se.omapi.uicc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.se.omapi.uicc.xml \
|
|
device/google/pantah/nfc/libse-gto-hal.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal.conf \
|
|
device/google/pantah/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf
|
|
|
|
DEVICE_MANIFEST_FILE += \
|
|
device/google/pantah/nfc/manifest_se.xml
|
|
|
|
# Thermal Config
|
|
PRODUCT_COPY_FILES += \
|
|
device/google/pantah/thermal_info_config_cloudripper.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json \
|
|
device/google/pantah/thermal_info_config_proto.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_proto.json
|
|
|
|
# Power HAL config
|
|
PRODUCT_COPY_FILES += \
|
|
device/google/pantah/powerhint-cloudripper.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json
|
|
|
|
# Bluetooth HAL
|
|
PRODUCT_COPY_FILES += \
|
|
device/google/pantah/bluetooth/bt_vendor_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/bt_vendor_overlay.conf
|
|
|
|
PRODUCT_PROPERTY_OVERRIDES += \
|
|
ro.bluetooth.a2dp_offload.supported=true \
|
|
persist.bluetooth.a2dp_offload.disabled=false \
|
|
persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac-opus
|
|
PRODUCT_PRODUCT_PROPERTIES += \
|
|
persist.bluetooth.firmware.selection=BCM.hcd
|
|
|
|
# default BDADDR for EVB only
|
|
PRODUCT_PROPERTY_OVERRIDES += \
|
|
ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55"
|
|
|
|
# Spatial Audio
|
|
PRODUCT_PACKAGES += \
|
|
libspatialaudio \
|
|
librondo
|
|
|
|
# Keymaster HAL
|
|
#LOCAL_KEYMASTER_PRODUCT_PACKAGE ?= android.hardware.keymaster@4.1-service
|
|
|
|
# Gatekeeper HAL
|
|
#LOCAL_GATEKEEPER_PRODUCT_PACKAGE ?= android.hardware.gatekeeper@1.0-service.software
|
|
|
|
|
|
# Gatekeeper
|
|
# PRODUCT_PACKAGES += \
|
|
# android.hardware.gatekeeper@1.0-service.software
|
|
|
|
# Keymint replaces Keymaster
|
|
# PRODUCT_PACKAGES += \
|
|
# android.hardware.security.keymint-service
|
|
|
|
# Keymaster
|
|
#PRODUCT_PACKAGES += \
|
|
# android.hardware.keymaster@4.0-impl \
|
|
# android.hardware.keymaster@4.0-service
|
|
|
|
#PRODUCT_PACKAGES += android.hardware.keymaster@4.0-service.remote
|
|
#PRODUCT_PACKAGES += android.hardware.keymaster@4.1-service.remote
|
|
#LOCAL_KEYMASTER_PRODUCT_PACKAGE := android.hardware.keymaster@4.1-service
|
|
#LOCAL_KEYMASTER_PRODUCT_PACKAGE ?= android.hardware.keymaster@4.1-service
|
|
|
|
# PRODUCT_PROPERTY_OVERRIDES += \
|
|
# ro.hardware.keystore_desede=true \
|
|
# ro.hardware.keystore=software \
|
|
# ro.hardware.gatekeeper=software
|
|
|
|
# PowerStats HAL
|
|
PRODUCT_SOONG_NAMESPACES += \
|
|
device/google/pantah/powerstats/cloudripper
|
|
|
|
# WiFi Overlay
|
|
PRODUCT_PACKAGES += \
|
|
WifiOverlay2022_C10 \
|
|
PixelWifiOverlay2022_C10
|
|
|
|
PRODUCT_SOONG_NAMESPACES += device/google/pantah/cheetah/
|
|
|
|
# Trusty liboemcrypto.so
|
|
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts
|
|
|
|
# Location
|
|
ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
|
|
PRODUCT_COPY_FILES += \
|
|
device/google/pantah/location/gps.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml \
|
|
device/google/pantah/location/lhd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
|
|
device/google/pantah/location/scd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf
|
|
else
|
|
PRODUCT_COPY_FILES += \
|
|
device/google/pantah/location/gps_user.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml \
|
|
device/google/pantah/location/lhd_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
|
|
device/google/pantah/location/scd_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf
|
|
|
|
endif
|
|
|
|
##Audio Vendor property
|
|
PRODUCT_PROPERTY_OVERRIDES += \
|
|
persist.vendor.audio.cca.enabled=false
|
|
|
|
# Set zram size
|
|
PRODUCT_VENDOR_PROPERTIES += \
|
|
vendor.zram.size=3g
|
|
|
|
# Device features
|
|
PRODUCT_COPY_FILES += \
|
|
frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml
|
|
|
|
# Vibrator HAL
|
|
$(call soong_config_set,haptics,kernel_ver,v$(subst .,_,$(TARGET_LINUX_KERNEL_VERSION)))
|