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

Commit 0bc23613 authored by Martin Stjernholm's avatar Martin Stjernholm Committed by Gerrit Code Review
Browse files

Merge "Update identifiers and paths to the new ART APEX."

parents 7882d923 f4caaa07

cmds/installd/dexopt.h

+8 −8
Original line number Diff line number Diff line
@@ -32,15 +32,15 @@ static constexpr int DEX2OAT_FROM_SCRATCH = 1; 
static constexpr int DEX2OAT_FOR_BOOT_IMAGE      = 2;

static constexpr int DEX2OAT_FOR_FILTER          = 3;



#define ANDROID_RUNTIME_APEX_BIN "/apex/com.android.runtime/bin"

#define ANDROID_ART_APEX_BIN "/apex/com.android.art/bin"

// Location of binaries in the Android Runtime APEX.

static constexpr const char* kDex2oatPath = ANDROID_RUNTIME_APEX_BIN "/dex2oat";

static constexpr const char* kDex2oatDebugPath = ANDROID_RUNTIME_APEX_BIN "/dex2oatd";

static constexpr const char* kProfmanPath = ANDROID_RUNTIME_APEX_BIN "/profman";

static constexpr const char* kProfmanDebugPath = ANDROID_RUNTIME_APEX_BIN "/profmand";

static constexpr const char* kDexoptanalyzerPath = ANDROID_RUNTIME_APEX_BIN "/dexoptanalyzer";

static constexpr const char* kDexoptanalyzerDebugPath = ANDROID_RUNTIME_APEX_BIN "/dexoptanalyzerd";

#undef ANDROID_RUNTIME_APEX_BIN

static constexpr const char* kDex2oatPath = ANDROID_ART_APEX_BIN "/dex2oat";

static constexpr const char* kDex2oatDebugPath = ANDROID_ART_APEX_BIN "/dex2oatd";

static constexpr const char* kProfmanPath = ANDROID_ART_APEX_BIN "/profman";

static constexpr const char* kProfmanDebugPath = ANDROID_ART_APEX_BIN "/profmand";

static constexpr const char* kDexoptanalyzerPath = ANDROID_ART_APEX_BIN "/dexoptanalyzer";

static constexpr const char* kDexoptanalyzerDebugPath = ANDROID_ART_APEX_BIN "/dexoptanalyzerd";

#undef ANDROID_ART_APEX_BIN



// Clear the reference profile identified by the given profile name.

bool clear_primary_reference_profile(const std::string& pkgname, const std::string& profile_name);

cmds/installd/otapreopt_chroot.cpp

+4 −4
Original line number Diff line number Diff line
@@ -233,17 +233,17 @@ static int otapreopt_chroot(const int argc, char **arg) { 
    }



    // Try to mount APEX packages in "/apex" in the chroot dir. We need at least

    // the Android Runtime APEX, as it is required by otapreopt to run dex2oat.

    // the ART APEX, as it is required by otapreopt to run dex2oat.

    std::vector<apex::ApexFile> active_packages = ActivateApexPackages();



    // Check that an Android Runtime APEX has been activated; clean up and exit

    // Check that an ART APEX has been activated; clean up and exit

    // early otherwise.

    if (std::none_of(active_packages.begin(),

                     active_packages.end(),

                     [](const apex::ApexFile& package){

                         return package.GetManifest().name() == "com.android.runtime";

                         return package.GetManifest().name() == "com.android.art";

                     })) {

        LOG(FATAL_WITHOUT_ABORT) << "No activated com.android.runtime APEX package.";

        LOG(FATAL_WITHOUT_ABORT) << "No activated com.android.art APEX package.";

        DeactivateApexPackages(active_packages);

        exit(217);

    }