From 6aabc9bd28d12250d38cdc2ee6d7695d34a659a5 Mon Sep 17 00:00:00 2001 From: Herbert Xue Date: Mon, 19 Aug 2024 16:19:20 +0800 Subject: [PATCH 1/2] Control the "init_dpm.sh" to be built in zuma devices Flag: EXEMPT bugfix Bug: 360757643 Test: lunch husky-trunk_staging-eng && m init_dpm.sh Change-Id: Ie9822ca65d875c120bc38707aee54353aac5a8b5 --- device.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/device.mk b/device.mk index 71a9da30..c8fb9766 100644 --- a/device.mk +++ b/device.mk @@ -80,6 +80,7 @@ PRODUCT_SOONG_NAMESPACES += \ device/google/zuma \ device/google/zuma/powerstats \ vendor/google_devices/common/chre/host/hal \ + vendor/google_devices/zuma/proprietary/debugpolicy \ vendor/google/whitechapel/tools \ vendor/google/interfaces \ vendor/google_nos/host/android \ From 20b924373fa7ed0540e8a5a48d27ed6495b44a4e Mon Sep 17 00:00:00 2001 From: Charlie Yang Date: Wed, 4 Sep 2024 11:02:52 +0000 Subject: [PATCH 2/2] Revert "Add soong config use_google_qns in device/google/zuma/de..." Revert submission 28947244-grilservice Reason for revert: b/363911795 Reverted changes: /q/submissionid:28947244-grilservice Change-Id: Iec8b16c4322a6e1a245c4bca22802ab29fe042a5 --- device.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/device.mk b/device.mk index 71a9da30..2e3f7712 100644 --- a/device.mk +++ b/device.mk @@ -232,7 +232,6 @@ USE_LASSEN_OEMHOOK := true ifneq ($(BOARD_WITHOUT_RADIO),true) $(call soong_config_set,sitril,use_lassen_oemhook_with_radio,true) PRODUCT_SOONG_NAMESPACES += vendor/google/tools/power-anomaly-sitril - $(call soong_config_set,grilservice,use_google_qns,true) endif # Use for GRIL