Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24a4f150 authored by Jiyong Park's avatar Jiyong Park Committed by android-build-merger
Browse files

Merge "Revert "Temporarily not inheriting updatable_apex.mk"" into qt-dev am: 63513e2b 

am: 2dd4e28c

Change-Id: I5a55ab79d3a2e84c7cc9b016af64adcf8144ee75
parents a7bb5923 2dd4e28c

target/product/mainline_system.mk

+1 −3
Original line number Diff line number Diff line
@@ -19,9 +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/languages_default.mk)

# Enable updating of APEXes

# TODO(b/130652892, b/129035564): uncomment following line when Pixel 2019 kernel

# is updated to support APEX.

#$(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)

$(call inherit-product-if-exists, vendor/google/security/adb/vendor_key.mk)