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

Commit ff4ce2f9 authored by Calin Juravle's avatar Calin Juravle Committed by Automerger Merge Worker
Browse files

Merge "Remove unused update_out_oat_access_times." am: 1fe4c9f1 am: ee6edd11 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1557663

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I17685f12959251d0974d727ba348221bfb693495
parents 60bda728 ee6edd11

cmds/installd/dexopt.cpp

+0 −19
Original line number Original line Diff line number Diff line
@@ -1130,23 +1130,6 @@ bool maybe_open_oat_and_vdex_file(const std::string& apk_path, 
    return true;

    return true;

}

}





// Updates the access times of out_oat_path based on those from apk_path.

void update_out_oat_access_times(const char* apk_path, const char* out_oat_path) {

    struct stat input_stat;

    memset(&input_stat, 0, sizeof(input_stat));

    if (stat(apk_path, &input_stat) != 0) {

        PLOG(ERROR) << "Could not stat " << apk_path << " during dexopt";

        return;

    }



    struct utimbuf ut;

    ut.actime = input_stat.st_atime;

    ut.modtime = input_stat.st_mtime;

    if (utime(out_oat_path, &ut) != 0) {

        PLOG(WARNING) << "Could not update access times for " << apk_path << " during dexopt";

    }

}



// Runs (execv) dexoptanalyzer on the given arguments.

// Runs (execv) dexoptanalyzer on the given arguments.

// The analyzer will check if the dex_file needs to be (re)compiled to match the compiler_filter.

// The analyzer will check if the dex_file needs to be (re)compiled to match the compiler_filter.

// If this is for a profile guided compilation, profile_was_updated will tell whether or not

// If this is for a profile guided compilation, profile_was_updated will tell whether or not
@@ -1843,8 +1826,6 @@ int dexopt(const char* dex_path, uid_t uid, const char* pkgname, const char* ins 
        }

        }

    }

    }





    update_out_oat_access_times(dex_path, out_oat.path().c_str());



    // We've been successful, don't delete output.

    // We've been successful, don't delete output.

    out_oat.DisableCleanup();

    out_oat.DisableCleanup();

    out_vdex.DisableCleanup();

    out_vdex.DisableCleanup();