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

Commit 7f593cfb authored by Bowgo Tsai's avatar Bowgo Tsai Committed by android-build-merger
Browse files

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

am: 88d73c02

Change-Id: I275df525f78ebb7717d2083df87bb1414d762634
parents 9129e86f 88d73c02

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",