commit 3bb4cd6af227b0dba3e8269d198bf392cf6faa0d
author Tom Cherry <tomcherry@google.com> Wed Aug 01 13:45:12 2018 -0700
committer Tom Cherry <tomcherry@google.com> Thu Aug 02 15:40:44 2018 -0700
tree 5e62cedeb4a1da095cf90a437022db2bff436660
parent c0213682b3a2063b2ac0bbf399d42cfb2ba7a40e

Include watchdogd where init is included

watchdogd is now separated out from init, so include it where init is
included.

Bug: 73660730
Test: watchdogd is still included on builds
Change-Id: I8208b4bcfd4e2a948744c241b744daf0be3d1381

target/product/base_system.mk

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 3311e3d..12cee24 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -241,6 +241,7 @@
     voip-common \
     vold \
     WallpaperBackup \
+    watchdogd \
     wificond \
     wifi-service \
     wm \

target/product/base_vendor.mk

diff --git a/target/product/base_vendor.mk b/target/product/base_vendor.mk
index 9542a0e..4926a3f 100644
--- a/target/product/base_vendor.mk
+++ b/target/product/base_vendor.mk
@@ -21,6 +21,7 @@
     linker.recovery \
     recovery \
     shell_and_utilities_recovery \
+    watchdogd.recovery \
 
 # Base modules and settings for the vendor partition.
 PRODUCT_PACKAGES += \