commit ca57f3b2f778b668353c5847f95ee8445dad0a1c
author Nikita Ioffe <ioffe@google.com> Tue Jun 02 10:56:46 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jun 02 10:56:46 2020 +0000
tree 6448322409f9c19dd5f1be39563b4ef3d95a0fa1
parent 8ea06221018a13d6aaf21e500ef850d36a89375e
parent 7269ca924ec9b87c168c92b836981b7bb95c4168

Disable userspace reboot am: 0ac8af6348 am: e5e939a00c am: 7269ca924e

Original change: undetermined

Change-Id: I9ba11c714f21cc9883e1b75f8840071627c2a894

bonito_car/device-common.mk

diff --git a/bonito_car/device-common.mk b/bonito_car/device-common.mk
index 830de03..471fc0b 100644
--- a/bonito_car/device-common.mk
+++ b/bonito_car/device-common.mk
@@ -27,9 +27,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)
-
 include device/google/bonito/device-audio-mfg.mk
 include device/google/bonito/device.mk
 

sargo_car/device-common.mk

diff --git a/sargo_car/device-common.mk b/sargo_car/device-common.mk
index 830de03..471fc0b 100644
--- a/sargo_car/device-common.mk
+++ b/sargo_car/device-common.mk
@@ -27,9 +27,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)
-
 include device/google/bonito/device-audio-mfg.mk
 include device/google/bonito/device.mk