From 715dd707c4c085a6eb79c29e52f32cfb8ce51aeb Mon Sep 17 00:00:00 2001 From: Inseob Kim Date: Wed, 28 Aug 2024 15:47:33 +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: I3dd200a1583be8f99bd5c30ecfed1bdc544ca783 --- rootdir/Android.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rootdir/Android.mk b/rootdir/Android.mk index f866e9bd4..ac9ca857f 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -35,7 +35,8 @@ LOCAL_POST_INSTALL_CMD := mkdir -p $(addprefix $(TARGET_ROOT_OUT)/, \ ln -sf /system/etc $(TARGET_ROOT_OUT)/etc; \ ln -sf /data/user_de/0/com.android.shell/files/bugreports $(TARGET_ROOT_OUT)/bugreports; \ ln -sfn /sys/kernel/debug $(TARGET_ROOT_OUT)/d; \ - ln -sf /storage/self/primary $(TARGET_ROOT_OUT)/sdcard + ln -sf /storage/self/primary $(TARGET_ROOT_OUT)/sdcard; \ + ln -sf /product/etc/security/adb_keys $(TARGET_ROOT_OUT)/adb_keys ALL_ROOTDIR_SYMLINKS := \ $(TARGET_ROOT_OUT)/bin \ @@ -150,4 +151,3 @@ $(ALL_ROOTDIR_SYMLINKS): $(LOCAL_BUILT_MODULE) init.environ.rc-soong := $(call intermediates-dir-for,ETC,init.environ.rc-soong)/init.environ.rc-soong $(eval $(call copy-one-file,$(init.environ.rc-soong),$(LOCAL_BUILT_MODULE))) init.environ.rc-soong := -