From 0bdf2998a8d4293fcdfc4fada2bc8827797b5dd3 Mon Sep 17 00:00:00 2001 From: Jasmine Cha Date: Wed, 3 Jan 2024 11:16:14 +0800 Subject: [PATCH 1/2] audio: move USE_AUDIO_HAL_AIDL to device-.mk Bug: 317745810 Test: manual test b/317745810#comment3 Change-Id: Ie6f1660dcf9d26bd14061ead187e1f3d8848d565 Signed-off-by: Jasmine Cha --- audio/aidl.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/audio/aidl.mk b/audio/aidl.mk index 711f389..185e628 100644 --- a/audio/aidl.mk +++ b/audio/aidl.mk @@ -1,4 +1,3 @@ -USE_AUDIO_HAL_AIDL := true DEVICE_MANIFEST_FILE += device/google/gs-common/audio/aidl/manifest.xml From 2d5681d51611783fe99bab0310b7383dc53c30ce Mon Sep 17 00:00:00 2001 From: samou Date: Wed, 3 Jan 2024 08:27:21 +0000 Subject: [PATCH 2/2] bm: create mk for new battery mitigation service Bug: 317869347 Change-Id: I09c95781cabc813d482b92e12ade944a32503f52 Signed-off-by: samou --- battery_mitigation/bcl-aidl.mk | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 battery_mitigation/bcl-aidl.mk diff --git a/battery_mitigation/bcl-aidl.mk b/battery_mitigation/bcl-aidl.mk new file mode 100644 index 0000000..83b4749 --- /dev/null +++ b/battery_mitigation/bcl-aidl.mk @@ -0,0 +1,17 @@ +ifeq ($(RELEASE_PIXEL_AIDL_BATTERY_MITIGATION_HAL), true) + +ifeq (,$(filter factory_%,$(TARGET_PRODUCT))) +PRODUCT_PACKAGES += battery_mitigation +endif +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +ifeq (,$(filter factory_%,$(TARGET_PRODUCT))) +PRODUCT_PACKAGES += BrownoutDetection +endif +endif + +PRODUCT_SOONG_NAMESPACES += device/google/gs-common/battery_mitigation +endif + +BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/battery_mitigation/sepolicy/vendor +SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += device/google/gs-common/battery_mitigation/sepolicy/system_ext/private +SYSTEM_EXT_PUBLIC_SEPOLICY_DIRS += device/google/gs-common/battery_mitigation/sepolicy/system_ext/public