Merge "Add adb keys to debuggable AOSP builds"

am: 40cd480454

Change-Id: Ib3c254058d07d5e94a998ee2c5b37634ab0b32b6
This commit is contained in:
Dan Willemsen 2017-11-02 00:59:46 +00:00 committed by android-build-merger
commit ccdbf9866c

View file

@ -53,3 +53,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/locales_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)