From 2ba28967b88f78a7fea923207bc8c61881fc28f8 Mon Sep 17 00:00:00 2001
From: Lei Ju <leiju@google.com>
Date: Fri, 15 Dec 2023 14:59:28 -0800
Subject: [PATCH] [zuma] Include common sepolicy of CHRE HAL

Bug: 248615564
Test: compilation
Change-Id: I6f335bbc5834915f9848f4f88d19fd12bd8c4199
---
 device.mk | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/device.mk b/device.mk
index a70ebfb6..149554a3 100644
--- a/device.mk
+++ b/device.mk
@@ -384,17 +384,16 @@ PRODUCT_HOST_PACKAGES += \
 PRODUCT_PACKAGES += \
 	messaging
 
-# Contexthub HAL
-PRODUCT_PACKAGES += \
-	android.hardware.contexthub-service.generic
-
-# CHRE tools
+# CHRE
+## Tools
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
 PRODUCT_PACKAGES += \
 	chre_power_test_client \
 	chre_test_client
 endif
 
+## HAL
+include device/google/gs-common/chre/hal.mk
 PRODUCT_COPY_FILES += \
 	frameworks/native/data/etc/android.hardware.context_hub.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.context_hub.xml