diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2019-03-19 05:02:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-03-19 05:02:58 +0000 |
| commit | 66920d20724be840d24d82ee0a21eeb9b4b61af6 (patch) | |
| tree | bf817fefbbc557c19711c711bd4176179f1b8271 | |
| parent | ea299553a07c535f2ac4413a8f4fe9bc3b74c793 (diff) | |
| parent | 0f961966e2320a748b4585b7139805d7bab13ba6 (diff) | |
| download | extras-66920d20724be840d24d82ee0a21eeb9b4b61af6.tar.gz | |
Merge "Allowing product-specific fstab.postinstall"
| -rw-r--r-- | cppreopts/cppreopts.rc | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/cppreopts/cppreopts.rc b/cppreopts/cppreopts.rc index 4ce04c51..812b4ce8 100644 --- a/cppreopts/cppreopts.rc +++ b/cppreopts/cppreopts.rc @@ -18,8 +18,17 @@ service cppreopts /system/bin/cppreopts.sh /postinstall user root capabilities -on property:sys.cppreopt=requested +# Post install is above Treble VINTF, because it runs some utilities from +# /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 + +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 |