commit 55f02d72f8aeedc77366a2aaadf78c856f12ba1d
author Bill Peckham <bpeckham@google.com> Fri Oct 04 20:38:31 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Oct 04 20:38:31 2019 -0700
tree c26469db9e6301a1ac3392e7f3f481094c33add6
parent 59976042055767c3567ed153b2b7cc26abb2b93b
parent 26fc2d3df90865ca5e2fca57b1ca83e9e0f36131

Merge "Moving recovery resources from /system to /vendor" am: ac6672d49f am: f8f67de2ae
am: fa44992325

Change-Id: I8d87d8ca9a70c8a616f09177e81d8730e18b80d0

libcutils/fs_config.cpp

diff --git a/libcutils/fs_config.cpp b/libcutils/fs_config.cpp
index d0d83de..5fb11a5 100644
--- a/libcutils/fs_config.cpp
+++ b/libcutils/fs_config.cpp
@@ -161,7 +161,6 @@
     { 00755, AID_ROOT,      AID_SHELL,     0, "system/bin/crash_dump32" },
     { 00755, AID_ROOT,      AID_SHELL,     0, "system/bin/crash_dump64" },
     { 00755, AID_ROOT,      AID_SHELL,     0, "system/bin/debuggerd" },
-    { 00750, AID_ROOT,      AID_ROOT,      0, "system/bin/install-recovery.sh" },
     { 00550, AID_LOGD,      AID_LOGD,      0, "system/bin/logd" },
     { 00700, AID_ROOT,      AID_ROOT,      0, "system/bin/secilc" },
     { 00750, AID_ROOT,      AID_ROOT,      0, "system/bin/uncrypt" },
@@ -173,9 +172,10 @@
     { 00550, AID_ROOT,      AID_SHELL,     0, "system/etc/init.ril" },
     { 00555, AID_ROOT,      AID_ROOT,      0, "system/etc/ppp/*" },
     { 00555, AID_ROOT,      AID_ROOT,      0, "system/etc/rc.*" },
-    { 00440, AID_ROOT,      AID_ROOT,      0, "system/etc/recovery.img" },
+    { 00750, AID_ROOT,      AID_ROOT,      0, "vendor/bin/install-recovery.sh" },
     { 00600, AID_ROOT,      AID_ROOT,      0, "vendor/build.prop" },
     { 00600, AID_ROOT,      AID_ROOT,      0, "vendor/default.prop" },
+    { 00440, AID_ROOT,      AID_ROOT,      0, "vendor/etc/recovery.img" },
     { 00444, AID_ROOT,      AID_ROOT,      0, ven_conf_dir + 1 },
     { 00444, AID_ROOT,      AID_ROOT,      0, ven_conf_file + 1 },
 

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index 6b000c6..f5b42b2 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -918,7 +918,3 @@
 
 on init && property:ro.debuggable=1
     start console
-
-service flash_recovery /system/bin/install-recovery.sh
-    class main
-    oneshot