From 3ec821fcfb092adb5bf1606d8261435f19543ff5 Mon Sep 17 00:00:00 2001 From: Tom Cherry Date: Tue, 16 Apr 2019 14:57:49 -0700 Subject: [PATCH] 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 --- CleanSpec.mk | 2 ++ rootdir/Android.mk | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CleanSpec.mk b/CleanSpec.mk index ebe5f4a97..6f6481f0b 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -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) diff --git a/rootdir/Android.mk b/rootdir/Android.mk index 462ae8b12..004453442 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -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; \