From a2b661cfc15be226edcbcda329b38e8c7fa9178f Mon Sep 17 00:00:00 2001 From: Rick Yiu Date: Tue, 27 Aug 2024 15:04:37 +0000 Subject: [PATCH 1/3] Enable auto prefer idle Also disable prefer idle for TA and FG by default. Bug: 236868627 Flag: NONE powerhint change does not support flags Test: build pass Change-Id: I0d06e707900ec9a85decbdecbd184532743c7de0 --- perf/powerhint-husky.json | 3 --- perf/powerhint-ripcurrent.json | 3 --- perf/powerhint-shiba.json | 3 --- 3 files changed, 9 deletions(-) diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index f464ced..6adab31 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -228,7 +228,6 @@ "0", "1" ], - "DefaultIndex": 0, "ResetOnInit": true }, { @@ -436,7 +435,6 @@ "1", "0" ], - "DefaultIndex": 0, "ResetOnInit": true }, { @@ -473,7 +471,6 @@ "1", "0" ], - "DefaultIndex": 0, "ResetOnInit": true }, { diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json index 1f2ae91..5702708 100644 --- a/perf/powerhint-ripcurrent.json +++ b/perf/powerhint-ripcurrent.json @@ -214,7 +214,6 @@ "0", "1" ], - "DefaultIndex": 0, "ResetOnInit": true }, { @@ -422,7 +421,6 @@ "1", "0" ], - "DefaultIndex": 0, "ResetOnInit": true }, { @@ -459,7 +457,6 @@ "1", "0" ], - "DefaultIndex": 0, "ResetOnInit": true }, { diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index 26f7ea9..43ec6aa 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -218,7 +218,6 @@ "0", "1" ], - "DefaultIndex": 0, "ResetOnInit": true }, { @@ -436,7 +435,6 @@ "1", "0" ], - "DefaultIndex": 0, "ResetOnInit": true }, { @@ -473,7 +471,6 @@ "1", "0" ], - "DefaultIndex": 0, "ResetOnInit": true }, { From 50bfd1510395f1d3efc309f146ae516371c47b6c Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Fri, 6 Sep 2024 07:36:46 +0000 Subject: [PATCH 2/3] 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: I9066437856338ef7da02be5648a119c1c38cc288 Signed-off-by: Robin Peng --- husky/BoardConfig.mk | 1 + ripcurrent/BoardConfig.mk | 1 + shiba/BoardConfig.mk | 1 + 3 files changed, 3 insertions(+) diff --git a/husky/BoardConfig.mk b/husky/BoardConfig.mk index 63ef483..9240a13 100644 --- a/husky/BoardConfig.mk +++ b/husky/BoardConfig.mk @@ -45,6 +45,7 @@ include device/google/shusky/device-shusky-common.mk include device/google/zuma/BoardConfig-common.mk -include vendor/google_devices/zuma/prebuilts/BoardConfigVendor.mk +include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk -include vendor/google_devices/husky/proprietary/BoardConfigVendor.mk include device/google/shusky-sepolicy/husky-sepolicy.mk include device/google/shusky/wifi/BoardConfig-wifi.mk diff --git a/ripcurrent/BoardConfig.mk b/ripcurrent/BoardConfig.mk index a84d4b0..142e21a 100644 --- a/ripcurrent/BoardConfig.mk +++ b/ripcurrent/BoardConfig.mk @@ -31,5 +31,6 @@ include device/google/shusky/device-shusky-common.mk include device/google/zuma/BoardConfig-common.mk -include vendor/google_devices/zuma/prebuilts/BoardConfigVendor.mk +include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk include device/google/shusky-sepolicy/ripcurrent-sepolicy.mk include device/google/shusky/wifi/BoardConfig-wifi.mk diff --git a/shiba/BoardConfig.mk b/shiba/BoardConfig.mk index 30d204e..847a288 100644 --- a/shiba/BoardConfig.mk +++ b/shiba/BoardConfig.mk @@ -41,6 +41,7 @@ include device/google/shusky/device-shusky-common.mk include device/google/zuma/BoardConfig-common.mk -include vendor/google_devices/zuma/prebuilts/BoardConfigVendor.mk +include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk -include vendor/google_devices/shiba/proprietary/BoardConfigVendor.mk include device/google/shusky-sepolicy/shiba-sepolicy.mk include device/google/shusky/wifi/BoardConfig-wifi.mk From cc052744f183bc2e819c5c443a3551f9627644c7 Mon Sep 17 00:00:00 2001 From: Koli Lin Date: Thu, 5 Sep 2024 08:19:12 +0000 Subject: [PATCH 3/3] Update product id for Shiba and Husky Test: manual Bug: 316248308 Flag: EXEMPT prop value only update Change-Id: I5f8afb3ab826864884b3ba2cf27bd149efea3c2f --- device-husky.mk | 3 ++- device-shiba.mk | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/device-husky.mk b/device-husky.mk index c5c9057..40e1216 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -519,8 +519,9 @@ PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true PRODUCT_CHECK_PREBUILT_MAX_PAGE_SIZE := true # Bluetooth device id +# Husky: 0x410D PRODUCT_PRODUCT_PROPERTIES += \ - bluetooth.device_id.product_id=20493 + bluetooth.device_id.product_id=16653 # Set support for LEA multicodec PRODUCT_PRODUCT_PROPERTIES += \ diff --git a/device-shiba.mk b/device-shiba.mk index 8d8d142..206e4a6 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -488,8 +488,9 @@ PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true PRODUCT_CHECK_PREBUILT_MAX_PAGE_SIZE := true # Bluetooth device id +# Shiba: 0x410E PRODUCT_PRODUCT_PROPERTIES += \ - bluetooth.device_id.product_id=20492 + bluetooth.device_id.product_id=16654 # Set support for LEA multicodec PRODUCT_PRODUCT_PROPERTIES += \