From 0cb36d7bbc5ba447654a86dece576de8d2bfd412 Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Mon, 7 Jan 2019 14:36:12 +0000 Subject: [PATCH] Add adb_keys to mainline_system if they exist Similar to I1720644d89ec5289fbe99f95ebcdfbb3f3b20e67, but for mainline_system. This reduces the diff between full_base.mk and mainline_system, a step on the way to get aosp_blueline inheriting mainline_system. Bug: 118826166 Test: make Change-Id: I52bfe5dfb3e1a22db2d46fe9d1f372ee25533fdd --- target/product/mainline_system.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/target/product/mainline_system.mk b/target/product/mainline_system.mk index de355e4b5..e57b06948 100644 --- a/target/product/mainline_system.mk +++ b/target/product/mainline_system.mk @@ -18,6 +18,8 @@ $(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) +# 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 PRODUCT_PACKAGES += \