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

Commit 4b10f282 authored by Calin Juravle's avatar Calin Juravle Committed by android-build-merger
Browse files

Merge "Remove store_aggregation_counters argument from profile merging" am: 56701ba8 

am: 554e0296

Change-Id: I5a8574a21e25e246b140793c82fffd4965b35a04
parents 062f3899 554e0296

cmds/installd/dexopt.cpp

+6 −16
Original line number Diff line number Diff line
@@ -720,8 +720,7 @@ class RunProfman : public ExecVHelper { 
                  const unique_fd& reference_profile_fd,

                  const std::vector<unique_fd>& apk_fds,

                  const std::vector<std::string>& dex_locations,

                  bool copy_and_update,

                  bool store_aggregation_counters) {

                  bool copy_and_update) {



        // TODO(calin): Assume for now we run in the bg compile job (which is in

        // most of the invocation). With the current data flow, is not very easy or
@@ -753,10 +752,6 @@ class RunProfman : public ExecVHelper { 
            AddArg("--copy-and-update-profile-key");

        }



        if (store_aggregation_counters) {

            AddArg("--store-aggregation-counters");

        }



        // Do not add after dex2oat_flags, they should override others for debugging.

        PrepareArgs(profman_bin);

    }
@@ -764,14 +759,12 @@ class RunProfman : public ExecVHelper { 
    void SetupMerge(const std::vector<unique_fd>& profiles_fd,

                    const unique_fd& reference_profile_fd,

                    const std::vector<unique_fd>& apk_fds = std::vector<unique_fd>(),

                    const std::vector<std::string>& dex_locations = std::vector<std::string>(),

                    bool store_aggregation_counters = false) {

                    const std::vector<std::string>& dex_locations = std::vector<std::string>()) {

        SetupArgs(profiles_fd,

                  reference_profile_fd,

                  apk_fds,

                  dex_locations,

                  /*copy_and_update=*/false,

                  store_aggregation_counters);

                  /*copy_and_update=*/false);

    }



    void SetupCopyAndUpdate(unique_fd&& profile_fd,
@@ -788,8 +781,7 @@ class RunProfman : public ExecVHelper { 
                  reference_profile_fd_,

                  apk_fds_,

                  dex_locations,

                  /*copy_and_update=*/true,

                  /*store_aggregation_counters=*/false);

                  /*copy_and_update=*/true);

    }



    void SetupDump(const std::vector<unique_fd>& profiles_fd,
@@ -803,8 +795,7 @@ class RunProfman : public ExecVHelper { 
                  reference_profile_fd,

                  apk_fds,

                  dex_locations,

                  /*copy_and_update=*/false,

                  /*store_aggregation_counters=*/false);

                  /*copy_and_update=*/false);

    }



    void Exec() {
@@ -2839,8 +2830,7 @@ static bool create_boot_image_profile_snapshot(const std::string& package_name, 
        args.SetupMerge(profiles_fd,

                        snapshot_fd,

                        apk_fds,

                        dex_locations,

                        /*store_aggregation_counters=*/true);

                        dex_locations);

        pid_t pid = fork();

        if (pid == 0) {

            /* child -- drop privileges before continuing */