Merge "Don't inherit updatable_apex from mainline_system"
This commit is contained in:
@@ -19,7 +19,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_system.mk)
|
|||||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system.mk)
|
$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system.mk)
|
||||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/languages_default.mk)
|
$(call inherit-product, $(SRC_TARGET_DIR)/product/languages_default.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)
|
||||||
# Add adb keys to debuggable AOSP builds (if they exist)
|
# Add adb keys to debuggable AOSP builds (if they exist)
|
||||||
$(call inherit-product-if-exists, vendor/google/security/adb/vendor_key.mk)
|
$(call inherit-product-if-exists, vendor/google/security/adb/vendor_key.mk)
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user