commit b9e504db68107849c520ccf386d00f0b5e75eb1a
author Elliott Hughes <enh@google.com> Tue Dec 10 10:05:28 2019 -0800
committer android-build-merger <android-build-merger@google.com> Tue Dec 10 10:05:28 2019 -0800
tree ceb705bd937907c7c6e95d7e0172312fd8e30751
parent e67336aa49701e1aea435354a7b7d4a7b59b1812
parent ed84f27552fd0ea6a29d60c00ccd658be852404b

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

Change-Id: Icf731c09c568f4062353d3e52c0cccc77cba57e8

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