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

Commit 773ebbdf authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "resolve merge conflicts of 73d9596b to oc-mr1-dev-plus-aosp" into oc-mr1-dev-plus-aosp

parents 202c5af4 62398781

CleanSpec.mk

+1 −0
Original line number Diff line number Diff line
@@ -70,3 +70,4 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/secure-storage-unit-test 
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/storageproxyd)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/tipc-test)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/trusty_keymaster_tipc)

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

libcutils/fs_config.cpp

+0 −1
Original line number Diff line number Diff line
@@ -80,7 +80,6 @@ static const struct fs_path_config android_dirs[] = { 
    { 00775, AID_ROOT,         AID_ROOT,         0, "data/preloads" },

    { 00771, AID_SYSTEM,       AID_SYSTEM,       0, "data" },

    { 00755, AID_ROOT,         AID_SYSTEM,       0, "mnt" },

    { 00755, AID_ROOT,         AID_ROOT,         0, "root" },

    { 00750, AID_ROOT,         AID_SHELL,        0, "sbin" },

    { 00777, AID_ROOT,         AID_ROOT,         0, "sdcard" },

    { 00751, AID_ROOT,         AID_SDCARD_R,     0, "storage" },

rootdir/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,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 oem acct config storage mnt root $(BOARD_ROOT_EXTRA_FOLDERS)); \

    sbin dev proc sys system data oem acct config storage mnt $(BOARD_ROOT_EXTRA_FOLDERS)); \

    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; \