commit 30c39c8605d4ceffd2e0917cfb7e25fef7b0c182
author Inseob Kim <inseob@google.com> Fri Aug 30 01:12:46 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Aug 30 01:12:46 2024 +0000
tree 11ff90d95aa5faf6033e41c6bfb3bd1aa4c72028
parent aeeadf43ad37f4990ea35ed537b02113273caa74
parent d7c4b9daeaaad9e51297d91b98daab0c5ec4678c

Merge "Move adb_keys to product partition" into main am: d7c4b9daea

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3244707

Change-Id: I7ad95aac88caf15eb2f31787428bdc42470fd8ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

rootdir/Android.mk

diff --git a/rootdir/Android.mk b/rootdir/Android.mk
index f866e9b..ac9ca85 100644
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@@ -35,7 +35,8 @@
     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 @@
 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 :=
-