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

Commit 1572f9b6 authored by Bowgo Tsai's avatar Bowgo Tsai Committed by Sandeep Patil
Browse files

Otadexopt: removing bootdevice from /dev/block/bootdevice/by-name/* 

We should switch to use /dev/block/by-name/<partition> because there is
no requirement to have a single 'bootdevice' for Android. The symlink is
created in the following change:

  https://android-review.googlesource.com/c/platform/system/core/+/674989

Bug: 80466341
Bug: 78613232
Test: m -j otapreopt_chroot
Test: Successful go/manual_ab_ota on walleye

Change-Id: I26fbf67e72cc2ee93909e95b0254ba1602e6ae8e
Merged-In: I26fbf67e72cc2ee93909e95b0254ba1602e6ae8e
(cherry picked from commit 19d2d08b)
parent 664ff4f0

cmds/installd/otapreopt_chroot.cpp

+2 −2
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ static int otapreopt_chroot(const int argc, char **arg) { 
        exit(207);

    }

    {

      std::string vendor_partition = StringPrintf("/dev/block/bootdevice/by-name/vendor%s",

      std::string vendor_partition = StringPrintf("/dev/block/by-name/vendor%s",

                                                  arg[2]);

      int vendor_result = mount(vendor_partition.c_str(),

                                "/postinstall/vendor",
@@ -128,7 +128,7 @@ static int otapreopt_chroot(const int argc, char **arg) { 
    // Try to mount the product partition. update_engine doesn't do this for us, but we

    // want it for product APKs. Same notes as vendor above.

    {

      std::string product_partition = StringPrintf("/dev/block/bootdevice/by-name/product%s",

      std::string product_partition = StringPrintf("/dev/block/by-name/product%s",

                                                   arg[2]);

      int product_result = mount(product_partition.c_str(),

                                 "/postinstall/product",