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

Commit f92fe9ae authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Adding 'postinstall' root dir unconditionally." am: f38f0fdd 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1517503

Change-Id: If1f345217ea0fd7c105c7b0a8232c9a8055028f4
parents da7bb0e8 f38f0fdd

rootdir/Android.mk

+1 −6
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ endif 
# create some directories (some are mount points) and symlinks

LOCAL_POST_INSTALL_CMD := mkdir -p $(addprefix $(TARGET_ROOT_OUT)/, \

    dev proc sys system data data_mirror odm oem acct config storage mnt apex debug_ramdisk \

    linkerconfig second_stage_resources $(BOARD_ROOT_EXTRA_FOLDERS)); \

    linkerconfig second_stage_resources postinstall $(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; \
@@ -153,11 +153,6 @@ ifdef BOARD_ROOT_EXTRA_SYMLINKS 
    ; mkdir -p $(dir $(TARGET_ROOT_OUT)/$(word 2,$(p))) \

    ; ln -sf $(word 1,$(p)) $(TARGET_ROOT_OUT)/$(word 2,$(p)))

endif

# The A/B updater uses a top-level /postinstall directory to mount the new

# system before reboot.

ifeq ($(AB_OTA_UPDATER),true)

  LOCAL_POST_INSTALL_CMD += ; mkdir -p $(TARGET_ROOT_OUT)/postinstall

endif



# The init symlink must be a post install command of a file that is to TARGET_ROOT_OUT.

# Since init.environ.rc is required for init and satisfies that requirement, we hijack it to create the symlink.