summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYifan Hong <elsk@google.com>2019-04-16 17:01:19 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-04-16 17:01:19 +0000
commit5e91e3fce339d94a0f8e90857c3f0aff07df27fa (patch)
tree0ae77e175dfd5a831ec7bc35097ea7c262a81a94
parentc3728ab933091558d3ba1cbdd78c8120849ebfdc (diff)
parent6acf718cc807f09e48637642a84b8951a55b2bb7 (diff)
downloadextras-5e91e3fce339d94a0f8e90857c3f0aff07df27fa.tar.gz
Merge "cppreopts: umount_all fstab.postinstall" into qt-dev
-rw-r--r--cppreopts/cppreopts.rc11
1 files changed, 6 insertions, 5 deletions
diff --git a/cppreopts/cppreopts.rc b/cppreopts/cppreopts.rc
index 60bd66ca..a7f69445 100644
--- a/cppreopts/cppreopts.rc
+++ b/cppreopts/cppreopts.rc
@@ -25,15 +25,16 @@ service cppreopts /system/bin/cppreopts.sh /postinstall
# /system. Therefore, the fstab can only be in either /system or /product.
on property:sys.cppreopt=requested && property:ro.postinstall.fstab.prefix=/system
mount_all /system/etc/fstab.postinstall
- setprop sys.cppreopt mounted
+ exec_start cppreopts
+ # Optional script to copy additional preloaded content to data directory
+ exec - system system -- /system/bin/preloads_copy.sh /postinstall
+ umount_all /system/etc/fstab.postinstall
+ setprop sys.cppreopt finished
on property:sys.cppreopt=requested && property:ro.postinstall.fstab.prefix=/product
mount_all /product/etc/fstab.postinstall
- setprop sys.cppreopt mounted
-
-on property:sys.cppreopt=mounted
exec_start cppreopts
# Optional script to copy additional preloaded content to data directory
exec - system system -- /system/bin/preloads_copy.sh /postinstall
- umount /postinstall
+ umount_all /product/etc/fstab.postinstall
setprop sys.cppreopt finished