From dd8efd5509c9d2887ec4964654f3377d4a3c15fa Mon Sep 17 00:00:00 2001 From: Jonglin Lee Date: Tue, 14 Jun 2022 11:42:39 -0700 Subject: [PATCH 1/5] gs201: exclude GNSS and vcd if BOARD_WITHOUT_RADIO Bug: 235907074 Test: Boot and check cpif does not boot loop Signed-off-by: Jonglin Lee Change-Id: I9347b29f945c438d2d9c206d56cfa172891b5c18 --- device.mk | 2 +- modem/userdebug.mk | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/device.mk b/device.mk index 61dc81ae..1632d6a4 100644 --- a/device.mk +++ b/device.mk @@ -899,10 +899,10 @@ USE_EARLY_SEND_DEVICE_INFO := true ifneq ($(BOARD_WITHOUT_RADIO),true) $(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)/common/device-vendor.mk) -endif #GPS HAL include device/google/gs201/gnss/device-gnss.mk +endif BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs201-sepolicy/gps $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk) diff --git a/modem/userdebug.mk b/modem/userdebug.mk index ba4c0e9d..2b0c3983 100644 --- a/modem/userdebug.mk +++ b/modem/userdebug.mk @@ -1 +1,3 @@ -PRODUCT_PACKAGES += vcd +ifneq ($(BOARD_WITHOUT_RADIO),true) + PRODUCT_PACKAGES += vcd +endif From 482a3c156214c225e79e68a02c0b5b066b04366e Mon Sep 17 00:00:00 2001 From: Dave Chen Date: Tue, 14 Jun 2022 00:49:37 -0700 Subject: [PATCH 2/5] Add folder needed to hold camera calibration files Test: run on P10 Bug: 233716733 Change-Id: Ic627d73d6d9a604bda71bf2f2a91c19fc9bb1437 --- conf/init.gs201.rc | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc index db36f369..b408976a 100644 --- a/conf/init.gs201.rc +++ b/conf/init.gs201.rc @@ -405,6 +405,7 @@ on post-fs-data chmod 0771 /mnt/vendor/persist/camera chmod 0771 /mnt/vendor/persist/camera/OTP_calibration chmod 0771 /mnt/vendor/persist/camera/pdaf_calibration_data + mkdir /mnt/vendor/persist/camera/rear 0770 system system chmod 0771 /mnt/vendor/persist/camera/rear # Audio dump and debug From 9dc497283cdb53d4857ab490b591c78684236569 Mon Sep 17 00:00:00 2001 From: Lucas Wei Date: Wed, 15 Jun 2022 10:08:09 +0800 Subject: [PATCH 3/5] Rename first stage module list to vendor_kernel_boot.modules.load Bug: 234554094 Signed-off-by: Lucas Wei Merged-In: Ie46ff0ef2db81169f519bc0266b8298a79712870 Change-Id: Ie46ff0ef2db81169f519bc0266b8298a79712870 --- BoardConfig-common.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index cf851dd9..f6907312 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -375,9 +375,9 @@ KERNEL_MODULES := $(wildcard $(KERNEL_MODULE_DIR)/*.ko) BOARD_VENDOR_KERNEL_MODULES_BLOCKLIST_FILE := $(KERNEL_MODULE_DIR)/vendor_dlkm.modules.blocklist -BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD := $(strip $(shell cat $(KERNEL_MODULE_DIR)/vendor_boot.modules.load)) +BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD := $(strip $(shell cat $(KERNEL_MODULE_DIR)/vendor_kernel_boot.modules.load)) ifndef BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD -$(error vendor_boot.modules.load not found or empty) +$(error vendor_kernel_boot.modules.load not found or empty) endif BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES := $(addprefix $(KERNEL_MODULE_DIR)/, $(notdir $(BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD))) From b2d1f99d60ec836b81f0d29b476c967cc0384c39 Mon Sep 17 00:00:00 2001 From: Lucas Wei Date: Wed, 15 Jun 2022 10:08:09 +0800 Subject: [PATCH 4/5] Rename first stage module list to vendor_kernel_boot.modules.load Bug: 234554094 Signed-off-by: Lucas Wei Change-Id: Ie46ff0ef2db81169f519bc0266b8298a79712870 --- BoardConfig-common.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index cf851dd9..f6907312 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -375,9 +375,9 @@ KERNEL_MODULES := $(wildcard $(KERNEL_MODULE_DIR)/*.ko) BOARD_VENDOR_KERNEL_MODULES_BLOCKLIST_FILE := $(KERNEL_MODULE_DIR)/vendor_dlkm.modules.blocklist -BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD := $(strip $(shell cat $(KERNEL_MODULE_DIR)/vendor_boot.modules.load)) +BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD := $(strip $(shell cat $(KERNEL_MODULE_DIR)/vendor_kernel_boot.modules.load)) ifndef BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD -$(error vendor_boot.modules.load not found or empty) +$(error vendor_kernel_boot.modules.load not found or empty) endif BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES := $(addprefix $(KERNEL_MODULE_DIR)/, $(notdir $(BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD))) From d179a435e7db5522680603d0246979278c8d4540 Mon Sep 17 00:00:00 2001 From: Alice Kuo Date: Wed, 15 Jun 2022 09:52:22 +0800 Subject: [PATCH 5/5] Disable LE audio related profiles for 2022 pixel by default Bug: 236090606 Bug: 231671426 Test: build Change-Id: I94046f63f745e875585aff3e0d84c3554e7439e5 --- device.mk | 7 ------- 1 file changed, 7 deletions(-) diff --git a/device.mk b/device.mk index ab7cb7cd..d693b5ef 100644 --- a/device.mk +++ b/device.mk @@ -141,24 +141,17 @@ PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.profile.asha.central.enabled?=true \ bluetooth.profile.a2dp.source.enabled?=true \ bluetooth.profile.avrcp.target.enabled?=true \ - bluetooth.profile.bap.broadcast.assist.enabled?=true \ - bluetooth.profile.bap.unicast.client.enabled?=true \ bluetooth.profile.bas.client.enabled?=true \ - bluetooth.profile.csip.set_coordinator.enabled?=true \ bluetooth.profile.gatt.enabled?=true \ - bluetooth.profile.hap.client.enabled?=true \ bluetooth.profile.hfp.ag.enabled?=true \ bluetooth.profile.hid.device.enabled?=true \ bluetooth.profile.hid.host.enabled?=true \ bluetooth.profile.map.server.enabled?=true \ - bluetooth.profile.mcp.server.enabled?=true \ bluetooth.profile.opp.enabled?=true \ bluetooth.profile.pan.nap.enabled?=true \ bluetooth.profile.pan.panu.enabled?=true \ bluetooth.profile.pbap.server.enabled?=true \ bluetooth.profile.sap.server.enabled?=true \ - bluetooth.profile.ccp.server.enabled?=true \ - bluetooth.profile.vcp.controller.enabled?=true # Carrier configuration default location PRODUCT_PROPERTY_OVERRIDES += \