diff options
| author | Martin Stjernholm <mast@google.com> | 2019-07-17 22:17:58 +0100 |
|---|---|---|
| committer | Martin Stjernholm <mast@google.com> | 2019-08-30 17:47:31 +0100 |
| commit | df96e1f25cad196385dc2ff6bcf1c8ec4619ab7c (patch) | |
| tree | dfe977e2822bdb7575ccb63d2230d2079ac0e4fe /libnativeloader/native_loader.cpp | |
| parent | cc746b51933624ea658a0656a51e0c9bf38b0f11 (diff) | |
Update paths and names for the new ART APEX.
Test: Build & boot
Test: atest CtsJniTestCases
Bug: 135753770
Exempt-From-Owner-Approval: Approved internally
Change-Id: Ic59b7bc8aae7ce521cf3ec9df4ab72aa611d0b75
Merged-In: Ic59b7bc8aae7ce521cf3ec9df4ab72aa611d0b75
Diffstat (limited to 'libnativeloader/native_loader.cpp')
| -rw-r--r-- | libnativeloader/native_loader.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libnativeloader/native_loader.cpp b/libnativeloader/native_loader.cpp index 6d3c057b9..60d462f87 100644 --- a/libnativeloader/native_loader.cpp +++ b/libnativeloader/native_loader.cpp @@ -63,6 +63,10 @@ android_namespace_t* FindExportedNamespace(const char* caller_location) { LOG_ALWAYS_FATAL_IF((dot_index == std::string::npos), "Error finding namespace of apex: no dot in apex name %s", caller_location); std::string name = location.substr(dot_index + 1, slash_index - dot_index - 1); + // TODO(b/139408016): Rename the runtime namespace to "art". + if (name == "art") { + name = "runtime"; + } android_namespace_t* boot_namespace = android_get_exported_namespace(name.c_str()); LOG_ALWAYS_FATAL_IF((boot_namespace == nullptr), "Error finding namespace of apex: no namespace called %s", name.c_str()); |