diff options
| author | Martin Stjernholm <mast@google.com> | 2019-09-02 03:45:06 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-09-02 03:45:06 -0700 |
| commit | 638c07856510784987e81ba0b026780850bf5775 (patch) | |
| tree | a3796f67d19deece6118e60d2faebde9499ce083 | |
| parent | c53bc3990415bf2319dc8b283ca35e1f8e0b77ac (diff) | |
| parent | 0bc2361309d705f8c7f7766f1912fd0f7035d199 (diff) | |
| download | native-temp_140451723.tar.gz | |
Merge "Update identifiers and paths to the new ART APEX."temp_140451723
am: 0bc2361309
Change-Id: I43cc3d40c768b68e8b026a28eb39d07defb72168
| -rw-r--r-- | cmds/installd/dexopt.h | 16 | ||||
| -rw-r--r-- | cmds/installd/otapreopt_chroot.cpp | 8 |
2 files changed, 12 insertions, 12 deletions
diff --git a/cmds/installd/dexopt.h b/cmds/installd/dexopt.h index a8c48c564e..ef739bafd4 100644 --- a/cmds/installd/dexopt.h +++ b/cmds/installd/dexopt.h @@ -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); diff --git a/cmds/installd/otapreopt_chroot.cpp b/cmds/installd/otapreopt_chroot.cpp index b4bcd53120..3ff9d11806 100644 --- a/cmds/installd/otapreopt_chroot.cpp +++ b/cmds/installd/otapreopt_chroot.cpp @@ -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); } |