commit ab778b1b0858f855320e4e8f9c3998051e375e76
author Elliott Hughes <enh@google.com> Fri Dec 08 00:58:26 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Dec 08 00:58:26 2017 +0000
tree e4f93a94e610d34a52fe0d0e6da8b681e784ab07
parent 2ed94643a8bd957103e1b9069b2d7dea04d39596
parent 33e0e324ddd8b0f8824dc614f37afe31e6fdef42

Merge "Add a /bin symlink for convenience." am: dcc0f8f76b am: 7a54ed9e28
am: 17197ac3e0

Change-Id: I1371ba22037f4466ec2799bb5a8b5056d57a2de2

rootdir/Android.mk

diff --git a/rootdir/Android.mk b/rootdir/Android.mk
index a338eb9..777fdb0 100644
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@@ -142,6 +142,7 @@
 # create some directories (some are mount points) and symlinks
 LOCAL_POST_INSTALL_CMD := mkdir -p $(addprefix $(TARGET_ROOT_OUT)/, \
     sbin dev proc sys system data oem acct config storage mnt $(BOARD_ROOT_EXTRA_FOLDERS)); \
+    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; \

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index 3d5451b..bdd75af 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -48,8 +48,10 @@
     copy /proc/cmdline /dev/urandom
     copy /default.prop /dev/urandom
 
-    # Backward compatibility.
+    symlink /system/bin /bin
     symlink /system/etc /etc
+
+    # Backward compatibility.
     symlink /sys/kernel/debug /d
 
     # Link /vendor to /system/vendor for devices without a vendor partition.