From bad1fd46490edc933770f971527b614221ef95d3 Mon Sep 17 00:00:00 2001 From: Koli Lin Date: Thu, 5 Sep 2024 08:20:53 +0000 Subject: [PATCH 1/2] Update product id for oriole and raven Test: manual Bug: 316248308 Flag: EXEMPT prop value only update Change-Id: Icf766314c7b23ed6cee0cf70eba5fe796d99a8b5 --- device-oriole.mk | 3 ++- device-raven.mk | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index 10048c9..95cc084 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -345,8 +345,9 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_AVF_REMOTE_ATTESTATION_DISABLED := true # Bluetooth device id +# Oriole: 0x4106 PRODUCT_PRODUCT_PROPERTIES += \ - bluetooth.device_id.product_id=20486 + bluetooth.device_id.product_id=16646 # ETM ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG)) diff --git a/device-raven.mk b/device-raven.mk index 8b790d9..4ceb39e 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -355,8 +355,9 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_AVF_REMOTE_ATTESTATION_DISABLED := true # Bluetooth device id +# Raven: 0x4107 PRODUCT_PRODUCT_PROPERTIES += \ - bluetooth.device_id.product_id=20487 + bluetooth.device_id.product_id=16647 # ETM ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG)) From 74e1b20cc4bac936c873307cbd07d73d5c773c39 Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Fri, 6 Sep 2024 07:30:23 +0000 Subject: [PATCH 2/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: I43355dc794b94084a9a1d80cc23382781eace1d8 Signed-off-by: Robin Peng --- oriole/BoardConfig.mk | 1 + raven/BoardConfig.mk | 1 + slider/BoardConfig.mk | 1 + whitefin/BoardConfig.mk | 1 + 4 files changed, 4 insertions(+) diff --git a/oriole/BoardConfig.mk b/oriole/BoardConfig.mk index 00a9a28..d77c0ef 100644 --- a/oriole/BoardConfig.mk +++ b/oriole/BoardConfig.mk @@ -42,6 +42,7 @@ include device/google/gs101/BoardConfig-common.mk include device/google/gs101-sepolicy/oriole-sepolicy.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/oriole/proprietary/BoardConfigVendor.mk ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG)) diff --git a/raven/BoardConfig.mk b/raven/BoardConfig.mk index 783511a..3d474b6 100644 --- a/raven/BoardConfig.mk +++ b/raven/BoardConfig.mk @@ -42,6 +42,7 @@ include device/google/gs101/BoardConfig-common.mk include device/google/gs101-sepolicy/raven-sepolicy.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/raven/proprietary/BoardConfigVendor.mk ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG)) diff --git a/slider/BoardConfig.mk b/slider/BoardConfig.mk index 82425d2..2224d56 100644 --- a/slider/BoardConfig.mk +++ b/slider/BoardConfig.mk @@ -23,3 +23,4 @@ BOARD_BOOTCONFIG += androidboot.selinux=permissive 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 diff --git a/whitefin/BoardConfig.mk b/whitefin/BoardConfig.mk index 5b5a07a..27f7c98 100644 --- a/whitefin/BoardConfig.mk +++ b/whitefin/BoardConfig.mk @@ -23,3 +23,4 @@ BOARD_BOOTCONFIG += androidboot.selinux=permissive 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