ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Add /apex tmpfs mount and mount it." am: c3b40a5793

Browse source 
am: 289da3205f

Change-Id: Iad8e049c4e82ba359aa334738db89f01a702dce3
This commit is contained in:
Martijn Coenen 2018-10-04 00:21:10 -07:00 • committed by android-build-merger
commit 6f76dff37e
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
rootdir/Android.mk
View file

@ -77,7 +77,7 @@ endif
# #
# create some directories (some are mount points) and symlinks # create some directories (some are mount points) and symlinks
LOCAL_POST_INSTALL_CMD := mkdir -p $(addprefix $(TARGET_ROOT_OUT)/, \ LOCAL_POST_INSTALL_CMD := mkdir -p $(addprefix $(TARGET_ROOT_OUT)/, \
sbin dev proc sys system data odm oem acct config storage mnt $(BOARD_ROOT_EXTRA_FOLDERS)); \ sbin 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/bin $(TARGET_ROOT_OUT)/bin; \
ln -sf /system/etc $(TARGET_ROOT_OUT)/etc; \ 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 /data/user_de/0/com.android.shell/files/bugreports $(TARGET_ROOT_OUT)/bugreports; \

8
rootdir/init.rc
View file

@ -269,6 +269,12 @@ on init
# that they can be chown'd to system:system later on boot # that they can be chown'd to system:system later on boot
write /sys/class/leds/vibrator/trigger "transient" write /sys/class/leds/vibrator/trigger "transient"
# Setup APEX mount point and its security context
mount tmpfs tmpfs /apex nodev noexec nosuid
chmod 0755 /apex
chown root root /apex
restorecon /apex
# Healthd can trigger a full boot from charger mode by signaling this # Healthd can trigger a full boot from charger mode by signaling this
# property when the power button is held. # property when the power button is held.
on property:sys.boot_from_charger_mode=1 on property:sys.boot_from_charger_mode=1
@ -524,6 +530,8 @@ on post-fs-data
mkdir /data/anr 0775 system system mkdir /data/anr 0775 system system
mkdir /data/apex 0770 root root
# NFC: create data/nfc for nv storage # NFC: create data/nfc for nv storage
mkdir /data/nfc 0770 nfc nfc mkdir /data/nfc 0770 nfc nfc
mkdir /data/nfc/param 0770 nfc nfc mkdir /data/nfc/param 0770 nfc nfc