Merge "Don't inherit userspace_reboot.mk from mainline_system.mk"
This commit is contained in:
@@ -24,9 +24,6 @@ $(call inherit-product-if-exists, vendor/google/security/adb/vendor_key.mk)
|
|||||||
# Enable updating of APEXes
|
# Enable updating of APEXes
|
||||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk)
|
$(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
|
# Shared java libs
|
||||||
PRODUCT_PACKAGES += \
|
PRODUCT_PACKAGES += \
|
||||||
com.android.nfc_extras \
|
com.android.nfc_extras \
|
||||||
|
Reference in New Issue
Block a user