commit e2e115fe2704756886d7807905b612e2eb83c5a2
author Elliott Hughes <enh@google.com> Tue Dec 10 10:07:30 2019 -0800
committer android-build-merger <android-build-merger@google.com> Tue Dec 10 10:07:30 2019 -0800
tree 6921b748be66e70f5de1449b440de408bca9e495
parent bd52d7cb46c2093cd504c82870d778664bf29675
parent b9e504db68107849c520ccf386d00f0b5e75eb1a

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

Change-Id: I858710db88f7cfe8761c1d50a795a8417e545e2a

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