Evolution-X-Tensor/device_google_shusky
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Snap for 11275524 from bc0894c4a3 to 24Q2-release

Browse source 
Change-Id: Ib40f16b65f75d81b3d04deea2ced9c3c8dac1cd0
This commit is contained in:
Android Build Coastguard Worker 2024-01-05 00:03:19 +00:00
commit a58619b261
11 changed files with 109 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

28
audio/husky/aidl_config/mixer_paths_aidl.xml
View file

@ -425,6 +425,10 @@
<path name="primary-playback-0 -> usb" /> <path name="primary-playback-0 -> usb" />
</path> </path>
<path name="primary-playback-0 -> hdmi-device">
<path name="primary-playback-0 -> usb" />
</path>
<path name="raw-playback -> speaker"> <path name="raw-playback -> speaker">
<ctl name="TDM_0_RX Mixer RAW" value="1" /> <ctl name="TDM_0_RX Mixer RAW" value="1" />
</path> </path>
@ -493,6 +497,10 @@
<path name="raw-playback-0 -> usb" /> <path name="raw-playback-0 -> usb" />
</path> </path>
<path name="raw-playback-0 -> hdmi-device">
<path name="raw-playback-0 -> usb" />
</path>
<path name="deep-buffer-playback -> speaker"> <path name="deep-buffer-playback -> speaker">
<ctl name="TDM_0_RX Mixer EP6" value="1" /> <ctl name="TDM_0_RX Mixer EP6" value="1" />
</path> </path>
@ -561,6 +569,10 @@
<path name="deep-buffer-playback-0 -> usb" /> <path name="deep-buffer-playback-0 -> usb" />
</path> </path>
<path name="deep-buffer-playback-0 -> hdmi-device">
<path name="deep-buffer-playback-0 -> usb" />
</path>
<path name="compress-offload-playback"> <path name="compress-offload-playback">
<ctl name="LVM Enable" value="1" /> <ctl name="LVM Enable" value="1" />
</path> </path>
@ -634,6 +646,10 @@
<path name="compress-offload-playback-0 -> usb" /> <path name="compress-offload-playback-0 -> usb" />
</path> </path>
<path name="compress-offload-playback-0 -> hdmi-device">
<path name="compress-offload-playback-0 -> usb" />
</path>
<path name="mmap-playback -> speaker"> <path name="mmap-playback -> speaker">
<ctl name="TDM_0_RX Mixer EP1" value="1" /> <ctl name="TDM_0_RX Mixer EP1" value="1" />
</path> </path>
@ -702,6 +718,10 @@
<path name="mmap-playback-0 -> usb" /> <path name="mmap-playback-0 -> usb" />
</path> </path>
<path name="mmap-playback-0 -> hdmi-device">
<path name="mmap-playback-0 -> usb" />
</path>
<path name="hifi-playback-0 -> usb"> <path name="hifi-playback-0 -> usb">
<ctl name="USB_RX Mixer HIFI" value="1" /> <ctl name="USB_RX Mixer HIFI" value="1" />
</path> </path>
@ -782,6 +802,10 @@
<path name="voip-playback-0 -> usb" /> <path name="voip-playback-0 -> usb" />
</path> </path>
<path name="voip-playback-0 -> hdmi-device">
<path name="voip-playback-0 -> usb" />
</path>
<path name="immersive-playback -> speaker"> <path name="immersive-playback -> speaker">
<ctl name="TDM_0_RX Mixer IMSV" value="1" /> <ctl name="TDM_0_RX Mixer IMSV" value="1" />
</path> </path>
@ -949,6 +973,10 @@
<path name="haptic-playback-0 -> usb" /> <path name="haptic-playback-0 -> usb" />
</path> </path>
<path name="haptic-playback-0 -> hdmi-device">
<path name="haptic-playback-0 -> usb" />
</path>
<!-- audio capture dynamic route --> <!-- audio capture dynamic route -->
<path name="microphones -> primary-capture-0"> <path name="microphones -> primary-capture-0">
<ctl name="EP1 TX Mixer INTERNAL_MIC_TX" value="1" /> <ctl name="EP1 TX Mixer INTERNAL_MIC_TX" value="1" />

28
audio/shiba/aidl_config/mixer_paths_aidl.xml
View file

@ -425,6 +425,10 @@
<path name="primary-playback-0 -> usb" /> <path name="primary-playback-0 -> usb" />
</path> </path>
<path name="primary-playback-0 -> hdmi-device">
<path name="primary-playback-0 -> usb" />
</path>
<path name="raw-playback -> speaker"> <path name="raw-playback -> speaker">
<ctl name="TDM_0_RX Mixer RAW" value="1" /> <ctl name="TDM_0_RX Mixer RAW" value="1" />
</path> </path>
@ -493,6 +497,10 @@
<path name="raw-playback-0 -> usb" /> <path name="raw-playback-0 -> usb" />
</path> </path>
<path name="raw-playback-0 -> hdmi-device">
<path name="raw-playback-0 -> usb" />
</path>
<path name="deep-buffer-playback -> speaker"> <path name="deep-buffer-playback -> speaker">
<ctl name="TDM_0_RX Mixer EP6" value="1" /> <ctl name="TDM_0_RX Mixer EP6" value="1" />
</path> </path>
@ -561,6 +569,10 @@
<path name="deep-buffer-playback-0 -> usb" /> <path name="deep-buffer-playback-0 -> usb" />
</path> </path>
<path name="deep-buffer-playback-0 -> hdmi-device">
<path name="deep-buffer-playback-0 -> usb" />
</path>
<path name="compress-offload-playback"> <path name="compress-offload-playback">
<ctl name="LVM Enable" value="1" /> <ctl name="LVM Enable" value="1" />
</path> </path>
@ -634,6 +646,10 @@
<path name="compress-offload-playback-0 -> usb" /> <path name="compress-offload-playback-0 -> usb" />
</path> </path>
<path name="compress-offload-playback-0 -> hdmi-device">
<path name="compress-offload-playback-0 -> usb" />
</path>
<path name="mmap-playback -> speaker"> <path name="mmap-playback -> speaker">
<ctl name="TDM_0_RX Mixer EP1" value="1" /> <ctl name="TDM_0_RX Mixer EP1" value="1" />
</path> </path>
@ -702,6 +718,10 @@
<path name="mmap-playback-0 -> usb" /> <path name="mmap-playback-0 -> usb" />
</path> </path>
<path name="mmap-playback-0 -> hdmi-device">
<path name="mmap-playback-0 -> usb" />
</path>
<path name="hifi-playback-0 -> usb"> <path name="hifi-playback-0 -> usb">
<ctl name="USB_RX Mixer HIFI" value="1" /> <ctl name="USB_RX Mixer HIFI" value="1" />
</path> </path>
@ -782,6 +802,10 @@
<path name="voip-playback-0 -> usb" /> <path name="voip-playback-0 -> usb" />
</path> </path>
<path name="voip-playback-0 -> hdmi-device">
<path name="voip-playback-0 -> usb" />
</path>
<path name="immersive-playback -> speaker"> <path name="immersive-playback -> speaker">
<ctl name="TDM_0_RX Mixer IMSV" value="1" /> <ctl name="TDM_0_RX Mixer IMSV" value="1" />
</path> </path>
@ -949,6 +973,10 @@
<path name="haptic-playback-0 -> usb" /> <path name="haptic-playback-0 -> usb" />
</path> </path>
<path name="haptic-playback-0 -> hdmi-device">
<path name="haptic-playback-0 -> usb" />
</path>
<!-- audio capture dynamic route --> <!-- audio capture dynamic route -->
<path name="microphones -> primary-capture-0"> <path name="microphones -> primary-capture-0">
<ctl name="EP1 TX Mixer INTERNAL_MIC_TX" value="1" /> <ctl name="EP1 TX Mixer INTERNAL_MIC_TX" value="1" />

19
device-husky.mk
View file

@ -20,6 +20,15 @@ $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk)
TARGET_KERNEL_DIR ?= device/google/shusky-kernel TARGET_KERNEL_DIR ?= device/google/shusky-kernel
TARGET_BOARD_KERNEL_HEADERS ?= device/google/shusky-kernel/kernel-headers TARGET_BOARD_KERNEL_HEADERS ?= device/google/shusky-kernel/kernel-headers
ifdef RELEASE_GOOGLE_HUSKY_KERNEL_VERSION
TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_HUSKY_KERNEL_VERSION)
endif
ifdef RELEASE_GOOGLE_HUSKY_KERNEL_DIR
TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_HUSKY_KERNEL_DIR)
TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_HUSKY_KERNEL_DIR)/kernel-headers
endif
LOCAL_PATH := device/google/shusky LOCAL_PATH := device/google/shusky
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
@ -48,6 +57,10 @@ PRODUCT_COPY_FILES += \
CAMERA_PRODUCT ?= husky CAMERA_PRODUCT ?= husky
ifeq ($(RELEASE_PIXEL_AIDL_AUDIO_HAL_ZUMA),true)
USE_AUDIO_HAL_AIDL := true
endif
include device/google/shusky/camera/camera.mk include device/google/shusky/camera/camera.mk
include device/google/shusky/audio/husky/audio-tables.mk include device/google/shusky/audio/husky/audio-tables.mk
include device/google/zuma/device-shipping-common.mk include device/google/zuma/device-shipping-common.mk
@ -193,6 +206,12 @@ PRODUCT_PRODUCT_PROPERTIES += \
bluetooth.profile.ccp.server.enabled=true \ bluetooth.profile.ccp.server.enabled=true \
bluetooth.profile.vcp.controller.enabled=true bluetooth.profile.vcp.controller.enabled=true
ifeq ($(RELEASE_PIXEL_BROADCAST_ENABLED), true)
PRODUCT_PRODUCT_PROPERTIES += \
bluetooth.profile.bap.broadcast.assist.enabled=true \
bluetooth.profile.bap.broadcast.source.enabled=true
endif
# Bluetooth LE Audio enable hardware offloading # Bluetooth LE Audio enable hardware offloading
PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \
ro.bluetooth.leaudio_offload.supported=true \ ro.bluetooth.leaudio_offload.supported=true \

15
device-ripcurrent.mk
View file

@ -20,6 +20,15 @@ $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk)
TARGET_KERNEL_DIR ?= device/google/shusky-kernel TARGET_KERNEL_DIR ?= device/google/shusky-kernel
TARGET_BOARD_KERNEL_HEADERS ?= device/google/shusky-kernel/kernel-headers TARGET_BOARD_KERNEL_HEADERS ?= device/google/shusky-kernel/kernel-headers
ifdef RELEASE_GOOGLE_RIPCURRENT_KERNEL_VERSION
TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_RIPCURRENT_KERNEL_VERSION)
endif
ifdef RELEASE_GOOGLE_RIPCURRENT_KERNEL_DIR
TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_RIPCURRENT_KERNEL_DIR)
TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_RIPCURRENT_KERNEL_DIR)/kernel-headers
endif
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
USE_UWBFIELDTESTQM := true USE_UWBFIELDTESTQM := true
endif endif
@ -158,6 +167,12 @@ PRODUCT_PRODUCT_PROPERTIES += \
bluetooth.profile.ccp.server.enabled=true \ bluetooth.profile.ccp.server.enabled=true \
bluetooth.profile.vcp.controller.enabled=true bluetooth.profile.vcp.controller.enabled=true
ifeq ($(RELEASE_PIXEL_BROADCAST_ENABLED), true)
PRODUCT_PRODUCT_PROPERTIES += \
bluetooth.profile.bap.broadcast.assist.enabled=true \
bluetooth.profile.bap.broadcast.source.enabled=true
endif
# Bluetooth LE Audio enable hardware offloading # Bluetooth LE Audio enable hardware offloading
PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \
ro.bluetooth.leaudio_offload.supported=true \ ro.bluetooth.leaudio_offload.supported=true \

19
device-shiba.mk
View file

@ -20,6 +20,15 @@ $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk)
TARGET_KERNEL_DIR ?= device/google/shusky-kernel TARGET_KERNEL_DIR ?= device/google/shusky-kernel
TARGET_BOARD_KERNEL_HEADERS ?= device/google/shusky-kernel/kernel-headers TARGET_BOARD_KERNEL_HEADERS ?= device/google/shusky-kernel/kernel-headers
ifdef RELEASE_GOOGLE_SHIBA_KERNEL_VERSION
TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_SHIBA_KERNEL_VERSION)
endif
ifdef RELEASE_GOOGLE_SHIBA_KERNEL_DIR
TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_SHIBA_KERNEL_DIR)
TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_SHIBA_KERNEL_DIR)/kernel-headers
endif
LOCAL_PATH := device/google/shusky LOCAL_PATH := device/google/shusky
$(call inherit-product-if-exists, vendor/google_devices/shusky/prebuilts/device-vendor-shiba.mk) $(call inherit-product-if-exists, vendor/google_devices/shusky/prebuilts/device-vendor-shiba.mk)
@ -32,6 +41,10 @@ $(call inherit-product-if-exists, vendor/google_devices/shusky/proprietary/Wallp
DEVICE_PACKAGE_OVERLAYS += device/google/shusky/shiba/overlay DEVICE_PACKAGE_OVERLAYS += device/google/shusky/shiba/overlay
CAMERA_PRODUCT ?= shiba CAMERA_PRODUCT ?= shiba
ifeq ($(RELEASE_PIXEL_AIDL_AUDIO_HAL_ZUMA),true)
USE_AUDIO_HAL_AIDL := true
endif
include device/google/shusky/camera/camera.mk include device/google/shusky/camera/camera.mk
include device/google/shusky/audio/shiba/audio-tables.mk include device/google/shusky/audio/shiba/audio-tables.mk
include device/google/zuma/device-shipping-common.mk include device/google/zuma/device-shipping-common.mk
@ -181,6 +194,12 @@ PRODUCT_PRODUCT_PROPERTIES += \
bluetooth.profile.ccp.server.enabled=true \ bluetooth.profile.ccp.server.enabled=true \
bluetooth.profile.vcp.controller.enabled=true bluetooth.profile.vcp.controller.enabled=true
ifeq ($(RELEASE_PIXEL_BROADCAST_ENABLED), true)
PRODUCT_PRODUCT_PROPERTIES += \
bluetooth.profile.bap.broadcast.assist.enabled=true \
bluetooth.profile.bap.broadcast.source.enabled=true
endif
# Bluetooth LE Audio enable hardware offloading # Bluetooth LE Audio enable hardware offloading
PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \
ro.bluetooth.leaudio_offload.supported=true \ ro.bluetooth.leaudio_offload.supported=true \

2
self-extractors_husky/extract-lists.txt
View file

@ -5,13 +5,11 @@
IMAGES/vendor_dlkm.img \ IMAGES/vendor_dlkm.img \
RADIO/bootloader.img \ RADIO/bootloader.img \
RADIO/radio.img \ RADIO/radio.img \
system_ext/etc/permissions/com.android.qns.xml \
system_ext/etc/permissions/com.shannon.imsservice.xml \ system_ext/etc/permissions/com.shannon.imsservice.xml \
system_ext/etc/permissions/com.shannon.rcsservice.xml \ system_ext/etc/permissions/com.shannon.rcsservice.xml \
system_ext/lib64/libmediaadaptor.so \ system_ext/lib64/libmediaadaptor.so \
system_ext/priv-app/ShannonRcs/ShannonRcs.apk \ system_ext/priv-app/ShannonRcs/ShannonRcs.apk \
system_ext/priv-app/ShannonIms/ShannonIms.apk \ system_ext/priv-app/ShannonIms/ShannonIms.apk \
system_ext/priv-app/PixelQualifiedNetworksService/PixelQualifiedNetworksService.apk \
" "
;; ;;

16
self-extractors_husky/google_devices/staging/Android.mk
View file

@ -22,22 +22,6 @@ ifneq ($(filter husky,$(TARGET_DEVICE)),)
endif endif
ifneq ($(filter husky,$(TARGET_DEVICE)),) ifneq ($(filter husky,$(TARGET_DEVICE)),)
include $(CLEAR_VARS)
LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
LOCAL_MODULE := PixelQualifiedNetworksService
LOCAL_MODULE_TAGS := optional
LOCAL_BUILT_MODULE_STEM := package.apk
LOCAL_SYSTEM_EXT_MODULE := true
LOCAL_PRIVILEGED_MODULE := true
LOCAL_MODULE_OWNER := google
LOCAL_MODULE_CLASS := APPS
LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
LOCAL_CERTIFICATE := platform
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE
include $(BUILD_PREBUILT)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX) LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
LOCAL_MODULE := ShannonIms LOCAL_MODULE := ShannonIms

2
self-extractors_husky/google_devices/staging/device-partial.mk
View file

@ -17,7 +17,6 @@ PRODUCT_SOONG_NAMESPACES += \
# AOSP packages required by the blobs # AOSP packages required by the blobs
PRODUCT_PACKAGES := \ PRODUCT_PACKAGES := \
PixelQualifiedNetworksService \
ShannonIms \ ShannonIms \
ShannonRcs \ ShannonRcs \
@ -26,7 +25,6 @@ PRODUCT_PACKAGES += \
# blob(s) necessary for husky hardware # blob(s) necessary for husky hardware
PRODUCT_COPY_FILES := \ PRODUCT_COPY_FILES := \
vendor/google_devices/husky/proprietary/com.android.qns.xml:system_ext/etc/permissions/com.android.qns.xml:google \
vendor/google_devices/husky/proprietary/com.shannon.imsservice.xml:system_ext/etc/permissions/com.shannon.imsservice.xml:samsung \ vendor/google_devices/husky/proprietary/com.shannon.imsservice.xml:system_ext/etc/permissions/com.shannon.imsservice.xml:samsung \
vendor/google_devices/husky/proprietary/com.shannon.rcsservice.xml:system_ext/etc/permissions/com.shannon.rcsservice.xml:samsung \ vendor/google_devices/husky/proprietary/com.shannon.rcsservice.xml:system_ext/etc/permissions/com.shannon.rcsservice.xml:samsung \

2
self-extractors_shiba/extract-lists.txt
View file

@ -5,13 +5,11 @@
IMAGES/vendor_dlkm.img \ IMAGES/vendor_dlkm.img \
RADIO/bootloader.img \ RADIO/bootloader.img \
RADIO/radio.img \ RADIO/radio.img \
system_ext/etc/permissions/com.android.qns.xml \
system_ext/etc/permissions/com.shannon.imsservice.xml \ system_ext/etc/permissions/com.shannon.imsservice.xml \
system_ext/etc/permissions/com.shannon.rcsservice.xml \ system_ext/etc/permissions/com.shannon.rcsservice.xml \
system_ext/lib64/libmediaadaptor.so \ system_ext/lib64/libmediaadaptor.so \
system_ext/priv-app/ShannonRcs/ShannonRcs.apk \ system_ext/priv-app/ShannonRcs/ShannonRcs.apk \
system_ext/priv-app/ShannonIms/ShannonIms.apk \ system_ext/priv-app/ShannonIms/ShannonIms.apk \
system_ext/priv-app/PixelQualifiedNetworksService/PixelQualifiedNetworksService.apk \
" "
;; ;;

16
self-extractors_shiba/google_devices/staging/Android.mk
View file

@ -22,22 +22,6 @@ ifneq ($(filter shiba,$(TARGET_DEVICE)),)
endif endif
ifneq ($(filter shiba,$(TARGET_DEVICE)),) ifneq ($(filter shiba,$(TARGET_DEVICE)),)
include $(CLEAR_VARS)
LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
LOCAL_MODULE := PixelQualifiedNetworksService
LOCAL_MODULE_TAGS := optional
LOCAL_BUILT_MODULE_STEM := package.apk
LOCAL_SYSTEM_EXT_MODULE := true
LOCAL_PRIVILEGED_MODULE := true
LOCAL_MODULE_OWNER := google
LOCAL_MODULE_CLASS := APPS
LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
LOCAL_CERTIFICATE := platform
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE
include $(BUILD_PREBUILT)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX) LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
LOCAL_MODULE := ShannonIms LOCAL_MODULE := ShannonIms

2
self-extractors_shiba/google_devices/staging/device-partial.mk
View file

@ -17,7 +17,6 @@ PRODUCT_SOONG_NAMESPACES += \
# AOSP packages required by the blobs # AOSP packages required by the blobs
PRODUCT_PACKAGES := \ PRODUCT_PACKAGES := \
PixelQualifiedNetworksService \
ShannonIms \ ShannonIms \
ShannonRcs \ ShannonRcs \
@ -26,7 +25,6 @@ PRODUCT_PACKAGES += \
# blob(s) necessary for shiba hardware # blob(s) necessary for shiba hardware
PRODUCT_COPY_FILES := \ PRODUCT_COPY_FILES := \
vendor/google_devices/shiba/proprietary/com.android.qns.xml:system_ext/etc/permissions/com.android.qns.xml:google \
vendor/google_devices/shiba/proprietary/com.shannon.imsservice.xml:system_ext/etc/permissions/com.shannon.imsservice.xml:samsung \ vendor/google_devices/shiba/proprietary/com.shannon.imsservice.xml:system_ext/etc/permissions/com.shannon.imsservice.xml:samsung \
vendor/google_devices/shiba/proprietary/com.shannon.rcsservice.xml:system_ext/etc/permissions/com.shannon.rcsservice.xml:samsung \ vendor/google_devices/shiba/proprietary/com.shannon.rcsservice.xml:system_ext/etc/permissions/com.shannon.rcsservice.xml:samsung \