StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Temporarily not inheriting updatable_apex.mk"" into qt-dev

Browse Source 
am: 63513e2b7d

Change-Id: Id6bceba64596b9a70db28fae8acd081ca14c9c2b
This commit is contained in:
Jiyong Park
2019-05-02 16:25:00 -07:00
committed by android-build-merger
parent cb83f8c594 63513e2b7d
commit 2dd4e28cb9
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
target/product/mainline_system.mk
View File

@@ -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)