commit bbfba3062425aebaa728d467dd4d5d288f49cf3a
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Dec 10 18:27:56 2019 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Dec 10 18:27:56 2019 +0000
tree 5a90f880e42fa13ed633faa01c98f61fad8cd82f
parent 344cf8ef44645e21aee40655a78b3fb08e1460a4
parent e2e115fe2704756886d7807905b612e2eb83c5a2

Merge "Be more careful about symlinking a file that actually exists on the host." am: 3498578c4c am: cd2a3a0b05 am: 07ddbff0f4

Change-Id: Ia0b82ff69fdf1ea329b7461797e19f61ad14abf0

rootdir/Android.mk

diff --git a/rootdir/Android.mk b/rootdir/Android.mk
index 994d9ae..002c690 100644
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@@ -76,7 +76,7 @@
     ln -sf /system/bin $(TARGET_ROOT_OUT)/bin; \
     ln -sf /system/etc $(TARGET_ROOT_OUT)/etc; \
     ln -sf /data/user_de/0/com.android.shell/files/bugreports $(TARGET_ROOT_OUT)/bugreports; \
-    ln -sf /sys/kernel/debug $(TARGET_ROOT_OUT)/d; \
+    ln -sfn /sys/kernel/debug $(TARGET_ROOT_OUT)/d; \
     ln -sf /storage/self/primary $(TARGET_ROOT_OUT)/sdcard
 ifdef BOARD_USES_VENDORIMAGE
   LOCAL_POST_INSTALL_CMD += ; mkdir -p $(TARGET_ROOT_OUT)/vendor