From 747ec292deaa58814f2cf6de011144f0981f58a9 Mon Sep 17 00:00:00 2001
From: Nikita Ioffe <ioffe@google.com>
Date: Mon, 1 Jun 2020 13:02:40 +0100
Subject: Disable userspace reboot

Test: builds
Test: build vendor/build.prop
Test: grep 'init.userspace_reboot' ${OUT}/vendor/build.prop
Bug: 157884323
Bug: 160959550
Merged-In: Ib6ff4c7c3dcd9172306cca0eb7615a485153ec29
Change-Id: Ib6ff4c7c3dcd9172306cca0eb7615a485153ec29
(cherry picked from commit 6496116e47bacfd6533d177acf24d19bccaf3604)
---
 device.mk | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/device.mk b/device.mk
index 8c491926..cd51a668 100755
--- a/device.mk
+++ b/device.mk
@@ -17,9 +17,6 @@
 # Enable updating of APEXes
 $(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk)
 
-# Enable userspace reboot
-$(call inherit-product, $(SRC_TARGET_DIR)/product/userspace_reboot.mk)
-
 ifneq (,$(filter 27, $(PRODUCT_EXTRA_VNDK_VERSIONS)))
     _vndk_test := true
 endif
-- 
cgit v1.2.3