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

Commit ad796518 authored by Calin Juravle's avatar Calin Juravle Committed by Gerrit Code Review
Browse files

Merge changes from topic 'secondary-dex' 

* changes:
  Fix the ownership of compiler artifacts for secondary dex files
  DEXOPT_FORCE may be passed for primary apk as well.
  [Installd] Clean up logic for secondary dex oat files
  Add installd logic for compiling secondary dex files
parents 16401044 2289c0ac

cmds/installd/InstalldNativeService.cpp

+14 −71
Original line number Diff line number Diff line
@@ -79,10 +79,6 @@ static constexpr const char* CODE_CACHE_DIR_POSTFIX = "/code_cache"; 
static constexpr const char* IDMAP_PREFIX = "/data/resource-cache/";

static constexpr const char* IDMAP_SUFFIX = "@idmap";



// NOTE: keep in sync with StorageManager

static constexpr int FLAG_STORAGE_DE = 1 << 0;

static constexpr int FLAG_STORAGE_CE = 1 << 1;



// NOTE: keep in sync with Installer

static constexpr int FLAG_CLEAR_CACHE_ONLY = 1 << 8;

static constexpr int FLAG_CLEAR_CODE_CACHE_ONLY = 1 << 9;
@@ -285,73 +281,6 @@ static int prepare_app_dir(const std::string& path, mode_t target_mode, uid_t ui 
    return 0;

}



/**

 * Prepare an app cache directory, which offers to fix-up the GID and

 * directory mode flags during a platform upgrade.

 */

static int prepare_app_cache_dir(const std::string& parent, const char* name, mode_t target_mode,

        uid_t uid, gid_t gid) {

    auto path = StringPrintf("%s/%s", parent.c_str(), name);

    struct stat st;

    if (stat(path.c_str(), &st) != 0) {

        if (errno == ENOENT) {

            // This is fine, just create it

            if (fs_prepare_dir_strict(path.c_str(), target_mode, uid, gid) != 0) {

                PLOG(ERROR) << "Failed to prepare " << path;

                return -1;

            } else {

                return 0;

            }

        } else {

            PLOG(ERROR) << "Failed to stat " << path;

            return -1;

        }

    }



    mode_t actual_mode = st.st_mode & (S_IRWXU | S_IRWXG | S_IRWXO | S_ISGID);

    if (st.st_uid != uid) {

        // Mismatched UID is real trouble; we can't recover

        LOG(ERROR) << "Mismatched UID at " << path << ": found " << st.st_uid

                << " but expected " << uid;

        return -1;

    } else if (st.st_gid == gid && actual_mode == target_mode) {

        // Everything looks good!

        return 0;

    }



    // Directory is owned correctly, but GID or mode mismatch means it's

    // probably a platform upgrade so we need to fix them

    FTS *fts;

    FTSENT *p;

    char *argv[] = { (char*) path.c_str(), nullptr };

    if (!(fts = fts_open(argv, FTS_PHYSICAL | FTS_XDEV, NULL))) {

        PLOG(ERROR) << "Failed to fts_open " << path;

        return -1;

    }

    while ((p = fts_read(fts)) != NULL) {

        switch (p->fts_info) {

        case FTS_DP:

            if (chmod(p->fts_accpath, target_mode) != 0) {

                PLOG(WARNING) << "Failed to chmod " << p->fts_path;

            }

            // Intentional fall through to also set GID

        case FTS_F:

            if (chown(p->fts_accpath, -1, gid) != 0) {

                PLOG(WARNING) << "Failed to chown " << p->fts_path;

            }

            break;

        case FTS_SL:

        case FTS_SLNONE:

            if (lchown(p->fts_accpath, -1, gid) != 0) {

                PLOG(WARNING) << "Failed to chown " << p->fts_path;

            }

            break;

        }

    }

    fts_close(fts);

    return 0;

}



binder::Status InstalldNativeService::createAppData(const std::unique_ptr<std::string>& uuid,

        const std::string& packageName, int32_t userId, int32_t flags, int32_t appId,

        const std::string& seInfo, int32_t targetSdkVersion, int64_t* _aidl_return) {
@@ -2013,6 +1942,20 @@ binder::Status InstalldNativeService::deleteOdex(const std::string& apkPath, 
    return res ? ok() : error();

}



binder::Status InstalldNativeService::reconcileSecondaryDexFile(

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

        const std::vector<std::string>& isas, const std::unique_ptr<std::string>& volumeUuid,

        int32_t storage_flag, bool* _aidl_return) {

    ENFORCE_UID(AID_SYSTEM);

    CHECK_ARGUMENT_UUID(volumeUuid);

    CHECK_ARGUMENT_PACKAGE_NAME(packageName);



    std::lock_guard<std::recursive_mutex> lock(mLock);

    bool result = android::installd::reconcile_secondary_dex_file(

            dexPath, packageName, uid, isas, volumeUuid, storage_flag, _aidl_return);

    return result ? ok() : error();

}



binder::Status InstalldNativeService::invalidateMounts() {

    ENFORCE_UID(AID_SYSTEM);

    std::lock_guard<std::recursive_mutex> lock(mLock);

cmds/installd/InstalldNativeService.h

+3 −0
Original line number Diff line number Diff line
@@ -105,6 +105,9 @@ public: 
            const std::string& outputPath);

    binder::Status deleteOdex(const std::string& apkPath, const std::string& instructionSet,

            const std::string& outputPath);

    binder::Status reconcileSecondaryDexFile(const std::string& dexPath,

        const std::string& packageName, int32_t uid, const std::vector<std::string>& isa,

        const std::unique_ptr<std::string>& volumeUuid, int32_t storage_flag, bool* _aidl_return);



    binder::Status invalidateMounts();

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

+4 −0
Original line number Diff line number Diff line
@@ -71,5 +71,9 @@ interface IInstalld { 
    void deleteOdex(@utf8InCpp String apkPath, @utf8InCpp String instructionSet,

            @utf8InCpp String outputPath);



    boolean reconcileSecondaryDexFile(@utf8InCpp String dexPath, @utf8InCpp String pkgName,

        int uid, in @utf8InCpp String[] isas, @nullable @utf8InCpp String volume_uuid,

        int storage_flag);



    void invalidateMounts();

}

cmds/installd/dexopt.cpp

+351 −32

File changed.

Preview size limit exceeded, changes collapsed.

cmds/installd/dexopt.h

+6 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ namespace android { 
namespace installd {



/* dexopt needed flags matching those in dalvik.system.DexFile */

static constexpr int NO_DEXOPT_NEEDED            = 0;

static constexpr int DEX2OAT_FROM_SCRATCH        = 1;

static constexpr int DEX2OAT_FOR_BOOT_IMAGE      = 2;

static constexpr int DEX2OAT_FOR_FILTER          = 3;
@@ -44,6 +45,11 @@ bool dump_profiles(int32_t uid, const char* pkgname, const char* code_paths); 


bool delete_odex(const char* apk_path, const char* instruction_set, const char* output_path);



bool reconcile_secondary_dex_file(const std::string& dex_path,

        const std::string& pkgname, int uid, const std::vector<std::string>& isas,

        const std::unique_ptr<std::string>& volumeUuid, int storage_flag,

        /*out*/bool* out_secondary_dex_exists);



int dexopt(const char *apk_path, uid_t uid, const char *pkgName, const char *instruction_set,

        int dexopt_needed, const char* oat_dir, int dexopt_flags, const char* compiler_filter,

        const char* volume_uuid, const char* shared_libraries);