Merge "Add adb keys to debuggable AOSP builds" am: 40cd480454 am: ccdbf9866c

am: b2830040b4

Change-Id: I944c70d920353bd7f31560566a31c25f58aa6a5b
This commit is contained in:
Dan Willemsen
2017-11-02 01:07:39 +00:00
committed by android-build-merger

View File

@@ -53,3 +53,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/languages_full.mk)
# Get everything else from the parent package # Get everything else from the parent package
$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_no_telephony.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/generic_no_telephony.mk)
# Add adb keys to debuggable AOSP builds (if they exist)
$(call inherit-product-if-exists, vendor/google/security/adb/vendor_key.mk)