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

Commit 4b74c810 authored by Martin Stjernholm's avatar Martin Stjernholm Committed by Automerger Merge Worker
Browse files

Merge "Add a flag to dumpProfiles to send --dump-classes-and-methods to... 

Merge "Add a flag to dumpProfiles to send --dump-classes-and-methods to profman." into tm-dev am: 5514be66 am: e9bca3ac

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



Change-Id: Ia97a22c1c8805e267882db06147ad04aa01bbfa0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dc8cf5a4 e9bca3ac

cmds/installd/InstalldNativeService.cpp

+4 −2
Original line number Diff line number Diff line
@@ -2976,13 +2976,15 @@ binder::Status InstalldNativeService::setAppQuota(const std::optional<std::strin 
// Dumps the contents of a profile file, using pkgname's dex files for pretty

// printing the result.

binder::Status InstalldNativeService::dumpProfiles(int32_t uid, const std::string& packageName,

        const std::string& profileName, const std::string& codePath, bool* _aidl_return) {

                                                   const std::string& profileName,

                                                   const std::string& codePath,

                                                   bool dumpClassesAndMethods, bool* _aidl_return) {

    ENFORCE_UID(AID_SYSTEM);

    CHECK_ARGUMENT_PACKAGE_NAME(packageName);

    CHECK_ARGUMENT_PATH(codePath);

    LOCK_PACKAGE();



    *_aidl_return = dump_profiles(uid, packageName, profileName, codePath);

    *_aidl_return = dump_profiles(uid, packageName, profileName, codePath, dumpClassesAndMethods);

    return ok();

}

cmds/installd/InstalldNativeService.h

+2 −1
Original line number Diff line number Diff line
@@ -134,7 +134,8 @@ public: 
    binder::Status mergeProfiles(int32_t uid, const std::string& packageName,

            const std::string& profileName, int* _aidl_return);

    binder::Status dumpProfiles(int32_t uid, const std::string& packageName,

            const std::string& profileName, const std::string& codePath, bool* _aidl_return);

                                const std::string& profileName, const std::string& codePath,

                                bool dumpClassesAndMethods, bool* _aidl_return);

    binder::Status copySystemProfile(const std::string& systemProfile,

            int32_t uid, const std::string& packageName, const std::string& profileName,

            bool* _aidl_return);

cmds/installd/binder/android/os/IInstalld.aidl

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ interface IInstalld { 


    int mergeProfiles(int uid, @utf8InCpp String packageName, @utf8InCpp String profileName);

    boolean dumpProfiles(int uid, @utf8InCpp String packageName, @utf8InCpp String  profileName,

            @utf8InCpp String codePath);

            @utf8InCpp String codePath, boolean dumpClassesAndMethods);

    boolean copySystemProfile(@utf8InCpp String systemProfile, int uid,

            @utf8InCpp String packageName, @utf8InCpp String profileName);

    void clearAppProfiles(@utf8InCpp String packageName, @utf8InCpp String profileName);

cmds/installd/dexopt.cpp

+10 −6
Original line number Diff line number Diff line
@@ -624,12 +624,15 @@ class RunProfman : public ExecVHelper { 
                  /*for_boot_image*/false);

    }



    void SetupDump(const std::vector<unique_fd>& profiles_fd,

                   const unique_fd& reference_profile_fd,

    void SetupDump(const std::vector<unique_fd>& profiles_fd, const unique_fd& reference_profile_fd,

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

                   const std::vector<unique_fd>& apk_fds,

                   const std::vector<unique_fd>& apk_fds, bool dump_classes_and_methods,

                   const unique_fd& output_fd) {

        if (dump_classes_and_methods) {

            AddArg("--dump-classes-and-methods");

        } else {

            AddArg("--dump-only");

        }

        AddArg(StringPrintf("--dump-output-to-fd=%d", output_fd.get()));

        SetupArgs(profiles_fd,

                  reference_profile_fd,
@@ -772,7 +775,7 @@ int analyze_primary_profiles(uid_t uid, const std::string& package_name, 
}



bool dump_profiles(int32_t uid, const std::string& pkgname, const std::string& profile_name,

        const std::string& code_path) {

                   const std::string& code_path, bool dump_classes_and_methods) {

    std::vector<unique_fd> profile_fds;

    unique_fd reference_profile_fd;

    std::string out_file_name = StringPrintf("/data/misc/profman/%s-%s.txt",
@@ -808,7 +811,8 @@ bool dump_profiles(int32_t uid, const std::string& pkgname, const std::string& p 




    RunProfman profman_dump;

    profman_dump.SetupDump(profile_fds, reference_profile_fd, dex_locations, apk_fds, output_fd);

    profman_dump.SetupDump(profile_fds, reference_profile_fd, dex_locations, apk_fds,

                           dump_classes_and_methods, output_fd);

    pid_t pid = fork();

    if (pid == 0) {

        /* child -- drop privileges before continuing */

cmds/installd/dexopt.h

+2 −4
Original line number Diff line number Diff line
@@ -88,10 +88,8 @@ bool create_profile_snapshot(int32_t app_id, 
                             const std::string& profile_name,

                             const std::string& classpath);



bool dump_profiles(int32_t uid,

                   const std::string& pkgname,

                   const std::string& profile_name,

                   const std::string& code_path);

bool dump_profiles(int32_t uid, const std::string& pkgname, const std::string& profile_name,

                   const std::string& code_path, bool dump_classes_and_methods);



bool copy_system_profile(const std::string& system_profile,

                         uid_t packageUid,