diff options
author | Anton Hansson | 2019-01-08 05:40:25 -0600 |
---|---|---|
committer | Gerrit Code Review | 2019-01-08 05:40:25 -0600 |
commit | 3a4a9665078bcb58c4577c04082b2d54a07d0be6 (patch) | |
tree | 68d24984257d733a8c3cfd33d6af3ec590ae5401 | |
parent | 64bf2593f056cb1d4d4f0f2b6186f562cf8c99f1 (diff) | |
parent | 0cb36d7bbc5ba447654a86dece576de8d2bfd412 (diff) | |
download | platform-build-3a4a9665078bcb58c4577c04082b2d54a07d0be6.tar.gz platform-build-3a4a9665078bcb58c4577c04082b2d54a07d0be6.tar.xz platform-build-3a4a9665078bcb58c4577c04082b2d54a07d0be6.zip |
Merge "Add adb_keys to mainline_system if they exist"
-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 1e73a7968..b9b422f24 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 += \ |