commit 1551860d572a39a15d01fe6fb608ac1928caf5bf
author android-build-team Robot <android-build-team-robot@google.com> Wed Jun 03 07:02:31 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed Jun 03 07:02:31 2020 +0000
tree 6448322409f9c19dd5f1be39563b4ef3d95a0fa1
parent 5b8fa128d0de3376b434f36977b57005daedade1
parent e7f0f04ea1c03cf608c7321b73c16f3c9497973e

Snap for 6554163 from e7f0f04ea1c03cf608c7321b73c16f3c9497973e to mainline-release

Change-Id: I7e99b8fac5fc13f58d2789a88e6aa7535d64522d

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