commit c1a02678ca70e219665d736e4a15dab733fb4b58
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jan 30 11:39:43 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jan 30 11:39:43 2020 +0000
tree 80e2e330eeac68a9525ccdd21ce1fbefda681574
parent 6ae6a21418824292790101a942d207b6847d2601
parent 46fe30f89c47800741e893a4325148bc14e91200

Merge "Don't inherit userspace_reboot.mk from mainline_system.mk" am: c3d679bb88 am: 46fe30f89c

Change-Id: Ibb00dcfc106d2ca0bc93ebcacaae8986995c850c

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 \