Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8f67de2 authored by Bill Peckham's avatar Bill Peckham Committed by android-build-merger
Browse files

Merge "Moving recovery resources from /system to /vendor" 

am: ac6672d4

Change-Id: I1ba6acff9e90520acc752b5d27d279a28b28f88f
parents e0cd965e ac6672d4

libcutils/fs_config.cpp

+2 −2
Original line number Diff line number Diff line
@@ -161,7 +161,6 @@ static const struct fs_path_config android_files[] = { 
    { 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 @@ static const struct fs_path_config android_files[] = { 
    { 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

+0 −4
Original line number Diff line number Diff line
@@ -918,7 +918,3 @@ on property:ro.debuggable=1 


on init && property:ro.debuggable=1

    start console
 


service flash_recovery /system/bin/install-recovery.sh

    class main

    oneshot