From 6d4536023b002f6377ca6a74a93604c9a38c0670 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Wed, 1 Nov 2017 15:04:11 -0700 Subject: [PATCH] Add adb keys to debuggable AOSP builds These don't exist on AOSP itself, but if they're added in, debuggable builds will include the keys. This way automated test farms don't need manual intervention to authenticate to the device over adb, but we don't disable security for everyone else. Bug: 32891559 Test: lunch aosp_marlin-userdebug; m Change-Id: I59011a5c1f45b0c8bd5c2355d2b4c3671f5da4e4 --- target/product/full_base.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/target/product/full_base.mk b/target/product/full_base.mk index f2652ebf7..7aac435cc 100644 --- a/target/product/full_base.mk +++ b/target/product/full_base.mk @@ -53,3 +53,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/locales_full.mk) # Get everything else from the parent package $(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)