From ff517c615118b622195ee4accab0f0489f9c2ebe Mon Sep 17 00:00:00 2001 From: Inseob Kim Date: Tue, 27 Aug 2024 17:48:46 +0900 Subject: [PATCH] Move adb_keys to product partition /adb_keys will be moved to /product/etc/security as it's a product-specific file. To prevent regression, /adb_keys will be a symlink to the new location. Bug: 353430323 Test: boot and connect adb with ADB_VENDOR_KEYS Change-Id: Ieee2974925df4b3797483c96b78a0d2a2aa9a57d --- target/product/base_product.mk | 4 ++++ target/product/base_system.mk | 1 - target/product/security/Android.mk | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/target/product/base_product.mk b/target/product/base_product.mk index 92fc420a13..acfc6534f8 100644 --- a/target/product/base_product.mk +++ b/target/product/base_product.mk @@ -26,3 +26,7 @@ PRODUCT_PACKAGES += \ product_manifest.xml \ selinux_policy_product \ product-build.prop \ + +# Packages included only for eng or userdebug builds, previously debug tagged +PRODUCT_PACKAGES_DEBUG += \ + adb_keys \ diff --git a/target/product/base_system.mk b/target/product/base_system.mk index 5b54051303..9e3453842c 100644 --- a/target/product/base_system.mk +++ b/target/product/base_system.mk @@ -466,7 +466,6 @@ PRODUCT_PACKAGES += \ # Packages included only for eng or userdebug builds, previously debug tagged PRODUCT_PACKAGES_DEBUG := \ - adb_keys \ adevice_fingerprint \ arping \ dmuserd \ diff --git a/target/product/security/Android.mk b/target/product/security/Android.mk index 91b272c1bd..138e5bbe31 100644 --- a/target/product/security/Android.mk +++ b/target/product/security/Android.mk @@ -10,7 +10,7 @@ ifdef PRODUCT_ADB_KEYS LOCAL_LICENSE_CONDITIONS := notice LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE LOCAL_MODULE_CLASS := ETC - LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) + LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT_ETC)/security LOCAL_PREBUILT_MODULE_FILE := $(PRODUCT_ADB_KEYS) include $(BUILD_PREBUILT) endif