From dd04cad62929b8271ad211b1303deba6ce2109c1 Mon Sep 17 00:00:00 2001 From: Poomarin Phloyphisut Date: Tue, 5 Dec 2023 09:24:49 +0000 Subject: [PATCH 1/5] [HDMI Audio] Add mixer paths for HDMI path. Test: Local test. Bug: 309696512 Change-Id: I62f23a8eb59690bbcc68e0255143ba97db01c7fe --- audio/husky/aidl_config/mixer_paths_aidl.xml | 28 ++++++++++++++++++++ audio/shiba/aidl_config/mixer_paths_aidl.xml | 28 ++++++++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/audio/husky/aidl_config/mixer_paths_aidl.xml b/audio/husky/aidl_config/mixer_paths_aidl.xml index d22b97c..61a2c65 100644 --- a/audio/husky/aidl_config/mixer_paths_aidl.xml +++ b/audio/husky/aidl_config/mixer_paths_aidl.xml @@ -425,6 +425,10 @@ + + + + @@ -493,6 +497,10 @@ + + + + @@ -561,6 +569,10 @@ + + + + @@ -634,6 +646,10 @@ + + + + @@ -702,6 +718,10 @@ + + + + @@ -782,6 +802,10 @@ + + + + @@ -901,6 +925,10 @@ + + + + diff --git a/audio/shiba/aidl_config/mixer_paths_aidl.xml b/audio/shiba/aidl_config/mixer_paths_aidl.xml index d22b97c..61a2c65 100644 --- a/audio/shiba/aidl_config/mixer_paths_aidl.xml +++ b/audio/shiba/aidl_config/mixer_paths_aidl.xml @@ -425,6 +425,10 @@ + + + + @@ -493,6 +497,10 @@ + + + + @@ -561,6 +569,10 @@ + + + + @@ -634,6 +646,10 @@ + + + + @@ -702,6 +718,10 @@ + + + + @@ -782,6 +802,10 @@ + + + + @@ -901,6 +925,10 @@ + + + + From 07f8628d8cecc3a4345d2a9f9bb79cc8d9d07d60 Mon Sep 17 00:00:00 2001 From: Aaron Ding Date: Wed, 27 Dec 2023 00:59:31 +0800 Subject: [PATCH 2/5] shusky: control the kernel by release configuration Bug: 317784824 Change-Id: I20edf043647311bd6bafd9720fa5074ae2f5da04 Signed-off-by: Aaron Ding --- device-husky.mk | 9 +++++++++ device-ripcurrent.mk | 9 +++++++++ device-shiba.mk | 9 +++++++++ 3 files changed, 27 insertions(+) diff --git a/device-husky.mk b/device-husky.mk index f4e2f00..986b972 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -20,6 +20,15 @@ $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk) TARGET_KERNEL_DIR ?= device/google/shusky-kernel 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 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) diff --git a/device-ripcurrent.mk b/device-ripcurrent.mk index 0d14aad..86df2e9 100644 --- a/device-ripcurrent.mk +++ b/device-ripcurrent.mk @@ -20,6 +20,15 @@ $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk) TARGET_KERNEL_DIR ?= device/google/shusky-kernel 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))) USE_UWBFIELDTESTQM := true endif diff --git a/device-shiba.mk b/device-shiba.mk index 83147ac..21cb10f 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -20,6 +20,15 @@ $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk) TARGET_KERNEL_DIR ?= device/google/shusky-kernel 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 $(call inherit-product-if-exists, vendor/google_devices/shusky/prebuilts/device-vendor-shiba.mk) From 60fbce1c4865a3a709fb58902f8d2e12fb8950e0 Mon Sep 17 00:00:00 2001 From: Jasmine Cha Date: Wed, 3 Jan 2024 14:42:56 +0800 Subject: [PATCH 3/5] audio: define USE_AUDIO_HAL_AIDL by project Bug: 317745810 Test: manual test. (check audio_policy and hal version) Change-Id: I410545d3f07126db72dbbb247ae45c264c7e0787 Signed-off-by: Jasmine Cha --- device-husky.mk | 4 ++++ device-shiba.mk | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/device-husky.mk b/device-husky.mk index cb60da0..0e5d3c8 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -48,6 +48,10 @@ PRODUCT_COPY_FILES += \ 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/audio/husky/audio-tables.mk include device/google/zuma/device-shipping-common.mk diff --git a/device-shiba.mk b/device-shiba.mk index 4156044..4e7c269 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -32,6 +32,10 @@ $(call inherit-product-if-exists, vendor/google_devices/shusky/proprietary/Wallp DEVICE_PACKAGE_OVERLAYS += device/google/shusky/shiba/overlay 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/audio/shiba/audio-tables.mk include device/google/zuma/device-shipping-common.mk From a594f27b87cd83cfcf0ac6c7cd0f250a422f54fe Mon Sep 17 00:00:00 2001 From: Alice Kuo Date: Wed, 3 Jan 2024 06:57:44 +0800 Subject: [PATCH 4/5] Enable broadcast source and broadcast assistant behind feature flag Bug: 309382793 Test: make build Change-Id: I4b77b950c3d23fb07082ecf3cac378c7f408dd41 --- device-husky.mk | 6 ++++++ device-ripcurrent.mk | 6 ++++++ device-shiba.mk | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/device-husky.mk b/device-husky.mk index cb60da0..74aa67a 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -193,6 +193,12 @@ PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.profile.ccp.server.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 PRODUCT_PRODUCT_PROPERTIES += \ ro.bluetooth.leaudio_offload.supported=true \ diff --git a/device-ripcurrent.mk b/device-ripcurrent.mk index 0d14aad..94a78ab 100644 --- a/device-ripcurrent.mk +++ b/device-ripcurrent.mk @@ -158,6 +158,12 @@ PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.profile.ccp.server.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 PRODUCT_PRODUCT_PROPERTIES += \ ro.bluetooth.leaudio_offload.supported=true \ diff --git a/device-shiba.mk b/device-shiba.mk index 4156044..3aea38e 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -181,6 +181,12 @@ PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.profile.ccp.server.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 PRODUCT_PRODUCT_PROPERTIES += \ ro.bluetooth.leaudio_offload.supported=true \ From 623233eac6150b37b230aedd2dd3a10d13484fb6 Mon Sep 17 00:00:00 2001 From: Xin Li Date: Thu, 4 Jan 2024 08:59:25 -0800 Subject: [PATCH 5/5] Remove PixelQualifiedNetworksService for AOSP builds. Bug: 309712809 Test: https://android-build.corp.google.com/builds/abtd/run/L26400030001089366 Change-Id: I23d7edacdce64bfc1ba99139b4dffbce149a6853 --- self-extractors_husky/extract-lists.txt | 2 -- .../google_devices/staging/Android.mk | 16 ---------------- .../google_devices/staging/device-partial.mk | 2 -- self-extractors_shiba/extract-lists.txt | 2 -- .../google_devices/staging/Android.mk | 16 ---------------- .../google_devices/staging/device-partial.mk | 2 -- 6 files changed, 40 deletions(-) diff --git a/self-extractors_husky/extract-lists.txt b/self-extractors_husky/extract-lists.txt index e8333da..9f3c26f 100644 --- a/self-extractors_husky/extract-lists.txt +++ b/self-extractors_husky/extract-lists.txt @@ -5,13 +5,11 @@ IMAGES/vendor_dlkm.img \ RADIO/bootloader.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.rcsservice.xml \ system_ext/lib64/libmediaadaptor.so \ system_ext/priv-app/ShannonRcs/ShannonRcs.apk \ system_ext/priv-app/ShannonIms/ShannonIms.apk \ - system_ext/priv-app/PixelQualifiedNetworksService/PixelQualifiedNetworksService.apk \ " ;; diff --git a/self-extractors_husky/google_devices/staging/Android.mk b/self-extractors_husky/google_devices/staging/Android.mk index a3a6f13..7aa8601 100644 --- a/self-extractors_husky/google_devices/staging/Android.mk +++ b/self-extractors_husky/google_devices/staging/Android.mk @@ -22,22 +22,6 @@ ifneq ($(filter husky,$(TARGET_DEVICE)),) endif 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) LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX) LOCAL_MODULE := ShannonIms diff --git a/self-extractors_husky/google_devices/staging/device-partial.mk b/self-extractors_husky/google_devices/staging/device-partial.mk index 9251f56..a5fd796 100644 --- a/self-extractors_husky/google_devices/staging/device-partial.mk +++ b/self-extractors_husky/google_devices/staging/device-partial.mk @@ -17,7 +17,6 @@ PRODUCT_SOONG_NAMESPACES += \ # AOSP packages required by the blobs PRODUCT_PACKAGES := \ - PixelQualifiedNetworksService \ ShannonIms \ ShannonRcs \ @@ -26,7 +25,6 @@ PRODUCT_PACKAGES += \ # blob(s) necessary for husky hardware 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.rcsservice.xml:system_ext/etc/permissions/com.shannon.rcsservice.xml:samsung \ diff --git a/self-extractors_shiba/extract-lists.txt b/self-extractors_shiba/extract-lists.txt index e8333da..9f3c26f 100644 --- a/self-extractors_shiba/extract-lists.txt +++ b/self-extractors_shiba/extract-lists.txt @@ -5,13 +5,11 @@ IMAGES/vendor_dlkm.img \ RADIO/bootloader.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.rcsservice.xml \ system_ext/lib64/libmediaadaptor.so \ system_ext/priv-app/ShannonRcs/ShannonRcs.apk \ system_ext/priv-app/ShannonIms/ShannonIms.apk \ - system_ext/priv-app/PixelQualifiedNetworksService/PixelQualifiedNetworksService.apk \ " ;; diff --git a/self-extractors_shiba/google_devices/staging/Android.mk b/self-extractors_shiba/google_devices/staging/Android.mk index 124f68a..60eca2a 100644 --- a/self-extractors_shiba/google_devices/staging/Android.mk +++ b/self-extractors_shiba/google_devices/staging/Android.mk @@ -22,22 +22,6 @@ ifneq ($(filter shiba,$(TARGET_DEVICE)),) endif 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) LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX) LOCAL_MODULE := ShannonIms diff --git a/self-extractors_shiba/google_devices/staging/device-partial.mk b/self-extractors_shiba/google_devices/staging/device-partial.mk index 99e217f..9c64f07 100644 --- a/self-extractors_shiba/google_devices/staging/device-partial.mk +++ b/self-extractors_shiba/google_devices/staging/device-partial.mk @@ -17,7 +17,6 @@ PRODUCT_SOONG_NAMESPACES += \ # AOSP packages required by the blobs PRODUCT_PACKAGES := \ - PixelQualifiedNetworksService \ ShannonIms \ ShannonRcs \ @@ -26,7 +25,6 @@ PRODUCT_PACKAGES += \ # blob(s) necessary for shiba hardware 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.rcsservice.xml:system_ext/etc/permissions/com.shannon.rcsservice.xml:samsung \