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

Commit eb7d5676 authored by Chris Morin's avatar Chris Morin Committed by android-build-merger
Browse files

Merge "have patchoat take directories instead of filenames" am: a92749eb am: 6853290f 

am: 82d2d092

Change-Id: I7e31caa95ecafa05a153b90bafe9c89bed72fd46
parents 273da7af 82d2d092

cmds/installd/otapreopt.cpp

+3 −3
Original line number Diff line number Diff line
@@ -352,7 +352,7 @@ private: 


        std::string preopted_boot_art_path = StringPrintf("/system/framework/%s/boot.art", isa);

        if (access(preopted_boot_art_path.c_str(), F_OK) == 0) {

          return PatchoatBootImage(art_path, isa);

          return PatchoatBootImage(isa_path, isa);

        } else {

          // No preopted boot image. Try to compile.

          return Dex2oatBootImage(boot_classpath_, art_path, oat_path, isa);
@@ -421,14 +421,14 @@ private: 
        CHECK_EQ(0, closedir(c_dir)) << "Unable to close directory.";

    }



    bool PatchoatBootImage(const std::string& art_path, const char* isa) const {

    bool PatchoatBootImage(const std::string& output_dir, const char* isa) const {

        // This needs to be kept in sync with ART, see art/runtime/gc/space/image_space.cc.



        std::vector<std::string> cmd;

        cmd.push_back("/system/bin/patchoat");



        cmd.push_back("--input-image-location=/system/framework/boot.art");

        cmd.push_back(StringPrintf("--output-image-file=%s", art_path.c_str()));

        cmd.push_back(StringPrintf("--output-image-directory=%s", output_dir.c_str()));



        cmd.push_back(StringPrintf("--instruction-set=%s", isa));