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

Commit b87a1c79 authored by Andreas Gampe's avatar Andreas Gampe
Browse files

Otadexopt: Attempt to mount product partition 

Attempt to mount the product partition to give postinstall dexopt
access to those APKs.

Bug: 78032768
Test: m
Test: manual
Change-Id: Ic74e2580a01d0fba3e217158e0d50ba1270f7806
parent 66fa492a

cmds/installd/otapreopt_chroot.cpp

+23 −8
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ static int otapreopt_chroot(const int argc, char **arg) { 
        LOG(ERROR) << "Target slot suffix not legal: " << arg[2];

        exit(207);

    }

    {

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

                                                  arg[2]);

      int vendor_result = mount(vendor_partition.c_str(),
@@ -122,6 +123,20 @@ static int otapreopt_chroot(const int argc, char **arg) { 
                                MS_RDONLY,

                                /* data */ nullptr);

      UNUSED(vendor_result);

    }



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

                                                   arg[2]);

      int product_result = mount(product_partition.c_str(),

                                 "/postinstall/product",

                                 "ext4",

                                 MS_RDONLY,

                                 /* data */ nullptr);

      UNUSED(product_result);

    }



    // Chdir into /postinstall.

    if (chdir("/postinstall") != 0) {