Merge "Don't inherit userspace_reboot.mk from mainline_system.mk" am: c3d679bb88 am: 46fe30f89c (c1a02678) · Commits · e / os / android_build

target/product/mainline_system.mk

+0 −3

Original line number	Diff line number	Diff line
		@@ -24,9 +24,6 @@ $(call inherit-product-if-exists, vendor/google/security/adb/vendor_key.mk)
		# 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 \