Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ec821fc authored by Tom Cherry's avatar Tom Cherry
Browse files

Do not create /sbin 

/sbin was traditionally used for static binaries on the ramdisk for
Android, but now everything is a shared binary, so this directory is
empty and we do not want to encourage creation of new libraries in
this directory.

Bug: 73660730
Test: build
Change-Id: I0d0aa052e1eaf529d18921c45169473df0ee51ff
parent e1d4648f

CleanSpec.mk

+2 −0
Original line number Diff line number Diff line
@@ -80,3 +80,5 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/vndksp.libraries.txt) 
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/sbin/charger)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/sbin/charger)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/sbin)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/sbin)

rootdir/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ endif 
#

# 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 odm oem acct config storage mnt apex $(BOARD_ROOT_EXTRA_FOLDERS)); \

    dev proc sys system data odm oem acct config storage mnt apex $(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; \