From e76e3837cdc70ea3f9a4c156c970cc00e66ccef1 Mon Sep 17 00:00:00 2001 From: Tobias Thierer Date: Thu, 2 Nov 2017 15:16:17 +0000 Subject: [PATCH] Revert "Add adb keys to debuggable AOSP builds" This reverts commit 6d4536023b002f6377ca6a74a93604c9a38c0670. Reason for revert: Suspected to have broken build_test on master: build/make/core/tasks/vendor_module_check.mk:108: error: Error: vendor module "adb_keys" in vendor/google/security/adb in product "aosp_lionhead" being installed to out/multiproduct-20171102103809/aosp_lionhead/target/product/lionhead/root/adb_keys which is not in the vendor tree or odm tree. Change-Id: If7c1c9f08604b1dfc1036ea6fe3cb487fafc3cf0 --- target/product/full_base.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/target/product/full_base.mk b/target/product/full_base.mk index 7aac435cc..f2652ebf7 100644 --- a/target/product/full_base.mk +++ b/target/product/full_base.mk @@ -53,6 +53,3 @@ $(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)