From 44cf3700a752e402052e831bb45f2cc271000e36 Mon Sep 17 00:00:00 2001
From: Anthony Stange <stange@google.com>
Date: Fri, 13 Aug 2021 19:08:04 +0000
Subject: [PATCH] Enable CHRE components for gs201

Bug: 194284732
Test: Build and flash firmware
Change-Id: I896cc666fba238e9b429941a51e8a8a3485049e5
---
 device.mk | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/device.mk b/device.mk
index fbe96922..016f3636 100644
--- a/device.mk
+++ b/device.mk
@@ -274,24 +274,24 @@ PRODUCT_PACKAGES += \
 	messaging
 
 # Contexthub HAL
-#PRODUCT_PACKAGES += \
-#	android.hardware.contexthub@1.2-service.generic
+PRODUCT_PACKAGES += \
+	android.hardware.contexthub@1.2-service.generic
 
 # CHRE tools
-#ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-#PRODUCT_PACKAGES += \
-#	chre_power_test_client \
-#	chre_test_client
-#endif
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+PRODUCT_PACKAGES += \
+	chre_power_test_client \
+	chre_test_client
+endif
 
-#PRODUCT_COPY_FILES += \
-#	frameworks/native/data/etc/android.hardware.context_hub.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.context_hub.xml
+PRODUCT_COPY_FILES += \
+	frameworks/native/data/etc/android.hardware.context_hub.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.context_hub.xml
 
 ## Enable the CHRE Daemon
-#CHRE_USF_DAEMON_ENABLED := true
-#PRODUCT_PACKAGES += \
-#	chre \
-#	preloaded_nanoapps.json
+CHRE_USF_DAEMON_ENABLED := true
+PRODUCT_PACKAGES += \
+	chre \
+	preloaded_nanoapps.json
 
 # Filesystem management tools
 PRODUCT_PACKAGES += \