summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2019-04-17 23:30:17 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2019-04-17 23:30:17 +0000
commit8e128468c0db6a4dea30db0edf73e709a61ae248 (patch)
tree0ae77e175dfd5a831ec7bc35097ea7c262a81a94
parent1232c3619b45c41cae201ae27b85eb0712fa6e3d (diff)
parent59ee7bd0f972b88e269b4d3a332d68b5731d0dd1 (diff)
downloadextras-8e128468c0db6a4dea30db0edf73e709a61ae248.tar.gz
Snap for 5476925 from 59ee7bd0f972b88e269b4d3a332d68b5731d0dd1 to qt-aml-release
Change-Id: Ia3f7614b8c63f23fc24de208e8e2c1ba4810bdc4
-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