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

Commit ad95fc06 authored by David Brazdil's avatar David Brazdil Committed by Gerrit Code Review
Browse files

Merge "installd: Simplify Dalvik cache path creation"

parents 60e97a4b 249c1796

cmds/installd/installd.cpp

+3 −3
Original line number Original line Diff line number Diff line
@@ -151,12 +151,11 @@ bool create_cache_path(char path[PKG_PATH_MAX], 
        return false;

        return false;

    }

    }





    sprintf(path,"%s%s/%s/%s%s",

    sprintf(path,"%s%s/%s/%s",

            android_data_dir.path,

            android_data_dir.path,

            DALVIK_CACHE,

            DALVIK_CACHE,

            instruction_set,

            instruction_set,

            src + 1, /* skip the leading / */

            src + 1 /* skip the leading / */);

            DALVIK_CACHE_POSTFIX);





    char* tmp =

    char* tmp =

            path +

            path +
@@ -171,6 +170,7 @@ bool create_cache_path(char path[PKG_PATH_MAX], 
        }

        }

    }

    }





    strcat(path, DALVIK_CACHE_POSTFIX);

    return true;

    return true;

}

}

cmds/installd/installd_constants.h

+1 −2
Original line number Original line Diff line number Diff line
@@ -28,8 +28,7 @@ constexpr const char* SECONDARY_USER_PREFIX = "user/"; 




// This is used as a string literal, can't be constants. TODO: std::string...

// This is used as a string literal, can't be constants. TODO: std::string...

#define DALVIK_CACHE "dalvik-cache"

#define DALVIK_CACHE "dalvik-cache"

constexpr const char* DALVIK_CACHE_POSTFIX = "/classes.dex";

constexpr const char* DALVIK_CACHE_POSTFIX = "@classes.dex";

constexpr const char* DALVIK_CACHE_POSTFIX2 = "@classes.dex";





constexpr size_t PKG_NAME_MAX = 128u;   /* largest allowed package name */

constexpr size_t PKG_NAME_MAX = 128u;   /* largest allowed package name */

constexpr size_t PKG_PATH_MAX = 256u;   /* max size of any path we use */

constexpr size_t PKG_PATH_MAX = 256u;   /* max size of any path we use */

cmds/installd/otapreopt.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -823,7 +823,7 @@ bool create_cache_path(char path[PKG_PATH_MAX], 
                                              DALVIK_CACHE,

                                              DALVIK_CACHE,

                                              instruction_set,

                                              instruction_set,

                                              from_src.c_str(),

                                              from_src.c_str(),

                                              DALVIK_CACHE_POSTFIX2);

                                              DALVIK_CACHE_POSTFIX);





    if (assembled_path.length() + 1 > PKG_PATH_MAX) {

    if (assembled_path.length() + 1 > PKG_PATH_MAX) {

        return false;

        return false;