From 1eb4d583af80f24d6aca71bdc61c68a3f87f157d Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Fri, 6 Sep 2024 07:32:25 +0000 Subject: [PATCH 1/2] 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: I1d77e050f607ac93fe45c9ba075c35274e1052f7 Signed-off-by: Robin Peng --- bluejay/BoardConfig.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/bluejay/BoardConfig.mk b/bluejay/BoardConfig.mk index 6496ad0..bb3ab52 100644 --- a/bluejay/BoardConfig.mk +++ b/bluejay/BoardConfig.mk @@ -43,6 +43,7 @@ BOARD_KERNEL_CMDLINE += disable_dma32=on include device/google/gs101/BoardConfig-common.mk include device/google/gs101/wifi/BoardConfig-wifi.mk -include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk +include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk -include vendor/google_devices/bluejay/proprietary/BoardConfigVendor.mk $(call soong_config_set,google3a_config,target_device,bluejay) From c787f48091ce3a2dd64f00dc858f915747fe7933 Mon Sep 17 00:00:00 2001 From: Koli Lin Date: Thu, 5 Sep 2024 08:20:33 +0000 Subject: [PATCH 2/2] Update product id for bluejay Test: manual Bug: 316248308 Flag: EXEMPT prop value only update Change-Id: I403b2eea2dbf170209157aba3b44945b3fff9bc8 --- device-bluejay.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index 079bd7b..7c70b6e 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -309,5 +309,6 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_AVF_REMOTE_ATTESTATION_DISABLED := true # Bluetooth device id +# Bluejay: 0x4108 PRODUCT_PRODUCT_PROPERTIES += \ - bluetooth.device_id.product_id=20488 + bluetooth.device_id.product_id=16648