Merge "Add adb_keys to mainline_system if they exist" am: 3a4a966507

am: 83d2837f4b

Change-Id: I6440dfbfcc1f5a8b296128c1e3497f15ca05a033
This commit is contained in:
Anton Hansson 2019-01-08 03:59:50 -08:00 committed by android-build-merger
commit 01193c8f4c

View file

@ -18,6 +18,8 @@
$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_system.mk) $(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)
# Add adb keys to debuggable AOSP builds (if they exist)
$(call inherit-product-if-exists, vendor/google/security/adb/vendor_key.mk)
# Shared java libs # Shared java libs
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \