diff options
author | Anton Hansson | 2019-01-07 08:36:12 -0600 |
---|---|---|
committer | Anton Hansson | 2019-01-07 08:36:12 -0600 |
commit | 0cb36d7bbc5ba447654a86dece576de8d2bfd412 (patch) | |
tree | 7cbedbf38712d65eae4f94b3988d9ced9fa8e5b2 /target | |
parent | 14fc7361b93a726af182c1647ce2ee592e755f31 (diff) | |
download | platform-build-0cb36d7bbc5ba447654a86dece576de8d2bfd412.tar.gz platform-build-0cb36d7bbc5ba447654a86dece576de8d2bfd412.tar.xz platform-build-0cb36d7bbc5ba447654a86dece576de8d2bfd412.zip |
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
Diffstat (limited to 'target')
-rw-r--r-- | target/product/mainline_system.mk | 2 |
1 files changed, 2 insertions, 0 deletions
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 @@ | |||
18 | $(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_system.mk) | 18 | $(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_system.mk) |
19 | $(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system.mk) | 19 | $(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system.mk) |
20 | $(call inherit-product, $(SRC_TARGET_DIR)/product/languages_default.mk) | 20 | $(call inherit-product, $(SRC_TARGET_DIR)/product/languages_default.mk) |
21 | # Add adb keys to debuggable AOSP builds (if they exist) | ||
22 | $(call inherit-product-if-exists, vendor/google/security/adb/vendor_key.mk) | ||
21 | 23 | ||
22 | # Shared java libs | 24 | # Shared java libs |
23 | PRODUCT_PACKAGES += \ | 25 | PRODUCT_PACKAGES += \ |