Define CHRE daemon variables and remove rc config
Define CHRE_DAEMON_USE_SDSPRPC for wahoo since the daemon needs it to
be built properly now.
Additionally, the daemon's init.rc config is now included as part of the
daemon makefile so remove it from the device's init.hardware.rc.
Bug: 139693714
Test: compile
Change-Id: I0aaf7a3d965abeac63f4f62d743e655be3bebc09
diff --git a/BoardConfig.mk b/BoardConfig.mk
index ba4e565..4f8e6df 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -130,6 +130,10 @@
WIFI_HIDL_FEATURE_AWARE := true
WIFI_HIDL_UNIFIED_SUPPLICANT_SERVICE_RC_ENTRY := true
+# CHRE
+CHRE_DAEMON_ENABLED := true
+CHRE_DAEMON_USE_SDSPRPC := true
+
# Audio
BOARD_USES_ALSA_AUDIO := true
AUDIO_FEATURE_ENABLED_MULTI_VOICE_SESSIONS := true
diff --git a/init.hardware.rc b/init.hardware.rc
index ea16a5f..315e776 100644
--- a/init.hardware.rc
+++ b/init.hardware.rc
@@ -703,13 +703,6 @@
oneshot
keycodes 114 115 116
-service vendor.chre /vendor/bin/chre
- class late_start
- user system
- group system
- socket chre seqpacket 0660 root system
- shutdown critical
-
service vendor.power_sh /vendor/bin/init.power.sh
class main
user root
