commit 54df8375ba408b7a0486a66dbc5125830cce21f1
author Keun-young Park <keunyoung@google.com> Tue Mar 28 09:41:36 2017 -0700
committer Keun-young Park <keunyoung@google.com> Thu Mar 30 14:13:42 2017 -0700
tree 3be33355df1fc97d34b37b23305ff8615eb1b3b1
parent adcb843de7ec473c31e6d78f081ed885440661f9

set zero shutdown timeout for eng build

- still it will take time to kill services, < 3 secs in tested device.

bug: 36678028
Test: reboot

(cherry picked from commit 56425ed87e1ad7c63437d67c3b17ed7e2ba8d340)

Change-Id: I75b5843b08cdcdbf67c4fe500aa0dd7302dd44d7

init/Android.mk

diff --git a/init/Android.mk b/init/Android.mk
index b52c949..1ca88d7 100644
--- a/init/Android.mk
+++ b/init/Android.mk
@@ -16,6 +16,14 @@
     -DREBOOT_BOOTLOADER_ON_PANIC=0
 endif
 
+ifneq (,$(filter eng,$(TARGET_BUILD_VARIANT)))
+init_options += \
+    -DSHUTDOWN_ZERO_TIMEOUT=1
+else
+init_options += \
+    -DSHUTDOWN_ZERO_TIMEOUT=0
+endif
+
 init_options += -DLOG_UEVENTS=0
 
 init_cflags += \