From 5af050c92e98141fbd0e3aa98ad0c706832bb219 Mon Sep 17 00:00:00 2001 From: Shinru Han Date: Tue, 27 Aug 2024 06:15:15 +0000 Subject: [PATCH 1/7] gps: Re-enable GLO & QZSS in US Test: on-device Bug: 353579502 Change-Id: Idad61501a4ff862163fb6710fe1a6946d05c3f85 --- location/gps.6.1.xml.c10 | 2 ++ location/gps.6.1.xml.p10 | 2 ++ location/gps.xml | 2 ++ location/gps.xml.c10 | 2 ++ location/gps.xml.p10 | 2 ++ location/gps_user.6.1.xml.c10 | 2 ++ location/gps_user.6.1.xml.p10 | 2 ++ location/gps_user.xml | 2 ++ location/gps_user.xml.c10 | 2 ++ location/gps_user.xml.p10 | 2 ++ 10 files changed, 20 insertions(+) diff --git a/location/gps.6.1.xml.c10 b/location/gps.6.1.xml.c10 index 4458163..d582845 100644 --- a/location/gps.6.1.xml.c10 +++ b/location/gps.6.1.xml.c10 @@ -100,6 +100,8 @@ /> diff --git a/location/gps.6.1.xml.p10 b/location/gps.6.1.xml.p10 index 55f7ef2..d132bfa 100644 --- a/location/gps.6.1.xml.p10 +++ b/location/gps.6.1.xml.p10 @@ -100,6 +100,8 @@ /> diff --git a/location/gps.xml b/location/gps.xml index 32e1ddc..e091ba3 100644 --- a/location/gps.xml +++ b/location/gps.xml @@ -100,6 +100,8 @@ /> diff --git a/location/gps.xml.c10 b/location/gps.xml.c10 index 4421513..ddfcd71 100644 --- a/location/gps.xml.c10 +++ b/location/gps.xml.c10 @@ -100,6 +100,8 @@ /> diff --git a/location/gps.xml.p10 b/location/gps.xml.p10 index 29cb0e1..5ccf3ee 100644 --- a/location/gps.xml.p10 +++ b/location/gps.xml.p10 @@ -100,6 +100,8 @@ /> diff --git a/location/gps_user.6.1.xml.c10 b/location/gps_user.6.1.xml.c10 index 378c9de..2aa6fc4 100644 --- a/location/gps_user.6.1.xml.c10 +++ b/location/gps_user.6.1.xml.c10 @@ -98,6 +98,8 @@ /> diff --git a/location/gps_user.6.1.xml.p10 b/location/gps_user.6.1.xml.p10 index 018d204..ebbc2f7 100644 --- a/location/gps_user.6.1.xml.p10 +++ b/location/gps_user.6.1.xml.p10 @@ -98,6 +98,8 @@ /> diff --git a/location/gps_user.xml b/location/gps_user.xml index c2b3c57..463f991 100644 --- a/location/gps_user.xml +++ b/location/gps_user.xml @@ -98,6 +98,8 @@ /> diff --git a/location/gps_user.xml.c10 b/location/gps_user.xml.c10 index 4acdcbf..a3c3879 100644 --- a/location/gps_user.xml.c10 +++ b/location/gps_user.xml.c10 @@ -98,6 +98,8 @@ /> diff --git a/location/gps_user.xml.p10 b/location/gps_user.xml.p10 index 7aaa0a7..a0a0103 100644 --- a/location/gps_user.xml.p10 +++ b/location/gps_user.xml.p10 @@ -98,6 +98,8 @@ /> From 59e6c38b1961878f1bd49ba3b17069d80907576f Mon Sep 17 00:00:00 2001 From: Ankit Goyal Date: Wed, 28 Aug 2024 22:55:05 -0700 Subject: [PATCH 2/7] Delete mapper4 manifest Bug: 362183626 Flag: EXEMPT manifest update Test: Boot to home on shiba Change-Id: If10ca62f1180f578a133afb3753d3e31ee7606f3 --- manifest.xml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/manifest.xml b/manifest.xml index e01d156..18109c6 100644 --- a/manifest.xml +++ b/manifest.xml @@ -48,15 +48,6 @@ default - - android.hardware.graphics.mapper - passthrough - 4.0 - - IMapper - default - - android.hardware.graphics.composer hwbinder From 579d88fdc79b8d37803175bd50bdd60185983d48 Mon Sep 17 00:00:00 2001 From: Pindar Yang Date: Thu, 29 Aug 2024 11:39:48 +0000 Subject: [PATCH 3/7] move bootloader and radio build flag to device mk Flag: build.RELEASE_GOOGLE_PRODUCT_RADIO_DIR, build.RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR Bug: 362618412 Change-Id: Ib99eab337312bc3568839b7f46e555defb3e1c56 Signed-off-by: Pindar Yang --- cheetah/BoardConfig.mk | 10 ---------- cloudripper/BoardConfig.mk | 8 -------- device-cheetah.mk | 13 +++++++++++++ device-cloudripper.mk | 10 ++++++++++ device-panther.mk | 13 +++++++++++++ device-ravenclaw.mk | 10 ++++++++++ panther/BoardConfig.mk | 10 ---------- ravenclaw/BoardConfig.mk | 8 -------- 8 files changed, 46 insertions(+), 36 deletions(-) diff --git a/cheetah/BoardConfig.mk b/cheetah/BoardConfig.mk index 6f7f2d5..9d18764 100644 --- a/cheetah/BoardConfig.mk +++ b/cheetah/BoardConfig.mk @@ -17,16 +17,6 @@ # Enable load module in parallel BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true -RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_CHEETAH_RADIO_DIR) -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 - # The modules which need to be loaded in sequential BOARD_KERNEL_CMDLINE += fips140.load_sequential=1 BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 diff --git a/cloudripper/BoardConfig.mk b/cloudripper/BoardConfig.mk index d923b44..e69540e 100644 --- a/cloudripper/BoardConfig.mk +++ b/cloudripper/BoardConfig.mk @@ -15,14 +15,6 @@ # TARGET_BOARD_INFO_FILE := device/google/pantah/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := cloudripper -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 TARGET_SCREEN_DENSITY := 440 BOARD_USES_GENERIC_AUDIO := true USES_DEVICE_GOOGLE_CLOUDRIPPER := true diff --git a/device-cheetah.mk b/device-cheetah.mk index 684eb4b..f2efb5e 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -17,6 +17,19 @@ # Restrict the visibility of Android.bp files to improve build analysis time $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk) +ifdef RELEASE_GOOGLE_CHEETAH_RADIO_DIR +RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_CHEETAH_RADIO_DIR) +endif +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 + + TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_CHEETAH_VERSION) # Keeps flexibility for kasan and ufs builds TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_CHEETAH_DIR) diff --git a/device-cloudripper.mk b/device-cloudripper.mk index 723d350..4896cda 100644 --- a/device-cloudripper.mk +++ b/device-cloudripper.mk @@ -17,6 +17,16 @@ # 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 diff --git a/device-panther.mk b/device-panther.mk index a629af7..1694d2d 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -17,6 +17,19 @@ # Restrict the visibility of Android.bp files to improve build analysis time $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk) +ifdef RELEASE_GOOGLE_PANTHER_RADIO_DIR +RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_PANTHER_RADIO_DIR) +endif +RELEASE_GOOGLE_BOOTLOADER_PANTHER_DIR ?= pdk# Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_PANTHER_DIR) +$(call soong_config_set,pantah_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_PANTHER_DIR)) +ifneq ($(filter trunk%, $(RELEASE_GOOGLE_BOOTLOADER_PANTHER_DIR)),) +$(call soong_config_set,pantah_fingerprint,prebuilt_dir,trunk) +else +$(call soong_config_set,pantah_fingerprint,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_PANTHER_DIR)) +endif + + TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_PANTHER_VERSION) # Keeps flexibility for kasan and ufs builds TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_PANTHER_DIR) diff --git a/device-ravenclaw.mk b/device-ravenclaw.mk index 19f0afc..115bdc7 100644 --- a/device-ravenclaw.mk +++ b/device-ravenclaw.mk @@ -17,6 +17,16 @@ # 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 diff --git a/panther/BoardConfig.mk b/panther/BoardConfig.mk index 34c72d7..23d00dd 100644 --- a/panther/BoardConfig.mk +++ b/panther/BoardConfig.mk @@ -21,16 +21,6 @@ BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true BOARD_KERNEL_CMDLINE += fips140.load_sequential=1 BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 -RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_PANTHER_RADIO_DIR) -RELEASE_GOOGLE_BOOTLOADER_PANTHER_DIR ?= pdk# Keep this for pdk TODO: b/327119000 -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_PANTHER_DIR) -$(call soong_config_set,pantah_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_PANTHER_DIR)) -ifneq ($(filter trunk%, $(RELEASE_GOOGLE_BOOTLOADER_PANTHER_DIR)),) -$(call soong_config_set,pantah_fingerprint,prebuilt_dir,trunk) -else -$(call soong_config_set,pantah_fingerprint,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_PANTHER_DIR)) -endif - ifdef PHONE_CAR_BOARD_PRODUCT include device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk else diff --git a/ravenclaw/BoardConfig.mk b/ravenclaw/BoardConfig.mk index 0ead4dc..caa2afc 100644 --- a/ravenclaw/BoardConfig.mk +++ b/ravenclaw/BoardConfig.mk @@ -15,14 +15,6 @@ # TARGET_BOARD_INFO_FILE := device/google/pantah/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := ravenclaw -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 TARGET_SCREEN_DENSITY := 560 BOARD_USES_GENERIC_AUDIO := true USES_DEVICE_GOOGLE_CLOUDRIPPER := true From 8962fe3676e2a7f77079d01b1d18fe4b9437ca5c Mon Sep 17 00:00:00 2001 From: Rick Yiu Date: Sat, 31 Aug 2024 02:25:50 +0000 Subject: [PATCH 4/7] Disable limiting camera_hal for LAUNCH hint for A0 devices If auto rotation is enabled, it will trigger LAUNCH hint while camera is running if device rotates, which could limit camera_hal tasks to little cores. So, disable it first until there is a new hint for the rotation event. Bug: 358103845 Test: build pass Flag: NONE powerhint change does not support flags Change-Id: I623ea20c5fa1f0d8b4404caf7e0de54f35921fe7 --- powerhint-cheetah-a0.json | 24 ------------------------ powerhint-panther-a0.json | 24 ------------------------ 2 files changed, 48 deletions(-) diff --git a/powerhint-cheetah-a0.json b/powerhint-cheetah-a0.json index 46267a3..0d0a92c 100644 --- a/powerhint-cheetah-a0.json +++ b/powerhint-cheetah-a0.json @@ -773,30 +773,6 @@ "Type": "DoHint", "Value": "LAUNCH_PMU" }, - { - "PowerHint": "LAUNCH", - "Type": "DoHint", - "EnableProperty": "vendor.powerhal.camerarunning", - "Value": "CDCPUSET_RESTRICTED" - }, - { - "PowerHint": "LAUNCH", - "Type": "DoHint", - "EnableProperty": "vendor.powerhal.camerarunning", - "Value": "CDHIGHCPUSETCPUS_RESTRICTED" - }, - { - "PowerHint": "LAUNCH", - "Type": "DoHint", - "EnableProperty": "vendor.powerhal.camerarunning", - "Value": "CDMIDCPUSETCPUS_RESTRICTED" - }, - { - "PowerHint": "LAUNCH", - "Type": "DoHint", - "EnableProperty": "vendor.powerhal.camerarunning", - "Value": "CDMIDHIGHCPUSETCPUS_RESTRICTED" - }, { "PowerHint": "LAUNCH_PMU", "Node": "PMU_POLL", diff --git a/powerhint-panther-a0.json b/powerhint-panther-a0.json index 4616902..d75dfca 100644 --- a/powerhint-panther-a0.json +++ b/powerhint-panther-a0.json @@ -762,30 +762,6 @@ "Type": "DoHint", "Value": "LAUNCH_PMU" }, - { - "PowerHint": "LAUNCH", - "Type": "DoHint", - "EnableProperty": "vendor.powerhal.camerarunning", - "Value": "CDCPUSET_RESTRICTED" - }, - { - "PowerHint": "LAUNCH", - "Type": "DoHint", - "EnableProperty": "vendor.powerhal.camerarunning", - "Value": "CDHIGHCPUSETCPUS_RESTRICTED" - }, - { - "PowerHint": "LAUNCH", - "Type": "DoHint", - "EnableProperty": "vendor.powerhal.camerarunning", - "Value": "CDMIDCPUSETCPUS_RESTRICTED" - }, - { - "PowerHint": "LAUNCH", - "Type": "DoHint", - "EnableProperty": "vendor.powerhal.camerarunning", - "Value": "CDMIDHIGHCPUSETCPUS_RESTRICTED" - }, { "PowerHint": "LAUNCH_PMU", "Node": "PMU_POLL", From ed46d4d34552d4dc46f3832c743f2d7830c0c842 Mon Sep 17 00:00:00 2001 From: Yabin Cui Date: Wed, 4 Sep 2024 21:08:48 -0700 Subject: [PATCH 5/7] cheetah/panther: add etm modules in userdebug/eng builds If etm modules aren't built with kernel prebuilts, then add them manually. Bug: 364755673 Bug: 364309766 Test: build cheetah-trunk_staging-userdebug Flag: build.RELEASE_ETM_IN_USERDEBUG_ENG Change-Id: I5b5ce51ca59c912f5ebbac66b6ade5adc90ec7f5 --- cheetah/BoardConfig.mk | 6 ++++++ device-cheetah.mk | 7 +++++++ device-panther.mk | 7 +++++++ panther/BoardConfig.mk | 6 ++++++ 4 files changed, 26 insertions(+) diff --git a/cheetah/BoardConfig.mk b/cheetah/BoardConfig.mk index 9d18764..d781920 100644 --- a/cheetah/BoardConfig.mk +++ b/cheetah/BoardConfig.mk @@ -33,3 +33,9 @@ include device/google/gs201/BoardConfig-common.mk -include vendor/google_devices/cheetah/proprietary/BoardConfigVendor.mk include device/google/pantah-sepolicy/cheetah-sepolicy.mk include device/google/pantah/wifi/BoardConfig-wifi.mk + +ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG)) +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +-include device/google/common/etm/BoardUserdebugModules.mk +endif +endif diff --git a/device-cheetah.mk b/device-cheetah.mk index f2efb5e..ba27799 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -468,3 +468,10 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Bluetooth device id PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.device_id.product_id=20490 + +# ETM +ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG)) +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk) +endif +endif diff --git a/device-panther.mk b/device-panther.mk index 1694d2d..b58d280 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -451,3 +451,10 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Bluetooth device id PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.device_id.product_id=20489 + +# ETM +ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG)) +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk) +endif +endif diff --git a/panther/BoardConfig.mk b/panther/BoardConfig.mk index 23d00dd..b090758 100644 --- a/panther/BoardConfig.mk +++ b/panther/BoardConfig.mk @@ -38,3 +38,9 @@ include device/google/gs201/BoardConfig-common.mk -include vendor/google_devices/panther/proprietary/BoardConfigVendor.mk include device/google/pantah-sepolicy/panther-sepolicy.mk include device/google/pantah/wifi/BoardConfig-wifi.mk + +ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG)) +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +-include device/google/common/etm/BoardUserdebugModules.mk +endif +endif From e2c00ec807d6b116031bd2b8ce726c7d86ca35fa Mon Sep 17 00:00:00 2001 From: Koli Lin Date: Thu, 5 Sep 2024 08:20:16 +0000 Subject: [PATCH 6/7] Update product id for cheetah and panther Test: manual Bug: 316248308 Flag: EXEMPT prop value only update Change-Id: I94fe27c36cebd8dc444d3c0f1eeaa6564e0b215b --- device-cheetah.mk | 5 +++-- device-panther.mk | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index ba27799..4bfe74a 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -466,12 +466,13 @@ PRODUCT_PRODUCT_PROPERTIES += \ ro.quick_start.device_id=cheetah # Bluetooth device id +# Cheetah: 0x410A PRODUCT_PRODUCT_PROPERTIES += \ - bluetooth.device_id.product_id=20490 + bluetooth.device_id.product_id=16650 # ETM ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG)) ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) $(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk) endif -endif +endif \ No newline at end of file diff --git a/device-panther.mk b/device-panther.mk index b58d280..a50f2ea 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -449,8 +449,9 @@ PRODUCT_PRODUCT_PROPERTIES += \ ro.quick_start.device_id=panther # Bluetooth device id +# Panther: 0x4109 PRODUCT_PRODUCT_PROPERTIES += \ - bluetooth.device_id.product_id=20489 + bluetooth.device_id.product_id=16649 # ETM ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG)) From 8d0fc0c2592a4184c7c790c92a56c8d579c917f3 Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Fri, 6 Sep 2024 07:33:57 +0000 Subject: [PATCH 7/7] Symlink current prebuilt folder to android root The Android are now based on Trunk Stable world and Pixel prebuilts CLs also needs to reply with this which controlled by the flag which results: - the flag value might be different on each branches - the flag value are mostly different on each release configuration - for local builds, ENGs' needs to figure out the correct location of current prebuilts by checking through entire prebuilt textproto files To alleviate this problem, create an symlink file under android root indicates current prebuilt path after invoke the android lunch cmd. Bug: 364831620 Flag: EXEMPT export current prebuilt path Change-Id: I1e68490a56b9471909f8b26b6952e042e930eefb Signed-off-by: Robin Peng --- cheetah/BoardConfig.mk | 1 + cloudripper/BoardConfig.mk | 1 + panther/BoardConfig.mk | 1 + ravenclaw/BoardConfig.mk | 1 + 4 files changed, 4 insertions(+) diff --git a/cheetah/BoardConfig.mk b/cheetah/BoardConfig.mk index d781920..c5076b3 100644 --- a/cheetah/BoardConfig.mk +++ b/cheetah/BoardConfig.mk @@ -30,6 +30,7 @@ BOARD_KERNEL_CMDLINE += swiotlb=noforce include device/google/gs201/BoardConfig-common.mk -include vendor/google_devices/gs201/prebuilts/BoardConfigVendor.mk +include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk -include vendor/google_devices/cheetah/proprietary/BoardConfigVendor.mk include device/google/pantah-sepolicy/cheetah-sepolicy.mk include device/google/pantah/wifi/BoardConfig-wifi.mk diff --git a/cloudripper/BoardConfig.mk b/cloudripper/BoardConfig.mk index e69540e..7d580f6 100644 --- a/cloudripper/BoardConfig.mk +++ b/cloudripper/BoardConfig.mk @@ -21,5 +21,6 @@ USES_DEVICE_GOOGLE_CLOUDRIPPER := true include device/google/gs201/BoardConfig-common.mk -include vendor/google_devices/gs201/prebuilts/BoardConfigVendor.mk +include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk include device/google/pantah-sepolicy/cloudripper-sepolicy.mk include device/google/pantah/wifi/BoardConfig-wifi.mk diff --git a/panther/BoardConfig.mk b/panther/BoardConfig.mk index b090758..efb9dd1 100644 --- a/panther/BoardConfig.mk +++ b/panther/BoardConfig.mk @@ -35,6 +35,7 @@ BOARD_KERNEL_CMDLINE += swiotlb=noforce include device/google/gs201/BoardConfig-common.mk -include vendor/google_devices/gs201/prebuilts/BoardConfigVendor.mk +include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk -include vendor/google_devices/panther/proprietary/BoardConfigVendor.mk include device/google/pantah-sepolicy/panther-sepolicy.mk include device/google/pantah/wifi/BoardConfig-wifi.mk diff --git a/ravenclaw/BoardConfig.mk b/ravenclaw/BoardConfig.mk index caa2afc..0ae59a1 100644 --- a/ravenclaw/BoardConfig.mk +++ b/ravenclaw/BoardConfig.mk @@ -21,5 +21,6 @@ USES_DEVICE_GOOGLE_CLOUDRIPPER := true include device/google/gs201/BoardConfig-common.mk -include vendor/google_devices/gs201/prebuilts/BoardConfigVendor.mk +include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk include device/google/pantah-sepolicy/ravenclaw-sepolicy.mk include device/google/pantah/wifi/BoardConfig-wifi.mk