commit c3d679bb88d79f5e7a59fcbe134435a7195bcfb5
author Nikita Ioffe <ioffe@google.com> Thu Jan 30 11:05:53 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 30 11:05:53 2020 +0000
tree 40af7de7b2a6e279734a46190e5a31c1d943a503
parent 86b453228687fa9d7d4a4020e466f3563af4e7ac
parent 18548cccc8879397fe1e3d0c59fe3c5bec475404

Merge "Don't inherit userspace_reboot.mk from mainline_system.mk"

target/product/mainline_system.mk

diff --git a/target/product/mainline_system.mk b/target/product/mainline_system.mk
index c880971..ccbc907 100644
--- a/target/product/mainline_system.mk
+++ b/target/product/mainline_system.mk
@@ -24,9 +24,6 @@
 # Enable updating of APEXes
 $(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk)
 
-# Mainline devices support userspace reboot
-$(call inherit-product, $(SRC_TARGET_DIR)/product/userspace_reboot.mk)
-
 # Shared java libs
 PRODUCT_PACKAGES += \
     com.android.nfc_extras \