summaryrefslogtreecommitdiff
path: root/libnativeloader/native_loader_namespace.h
diff options
context:
space:
mode:
author Martin Stjernholm <mast@google.com> 2021-04-28 14:52:01 +0100
committer Martin Stjernholm <mast@google.com> 2021-05-05 12:07:48 +0000
commit2207b7e7db463dfa96d071654c49268e22e8745f (patch)
treee01f687e8761a63d83b9858a02d529ddacc1b60f /libnativeloader/native_loader_namespace.h
parent107d22b9c7a97275e62bb5a97eb871713cfa0616 (diff)
Extend Link() to allow linking to the default namespace.
The code path through native bridge and NDK translation should propagate nullptr as well. This to support a later change that changes the way native test libraries are loaded in ART run tests. Test: art/test/testrunner/testrunner.py --target --64 --optimizing Bug: 130340935 Change-Id: I934d11942e41ccc6d140a7044faa160b006166f1
Diffstat (limited to 'libnativeloader/native_loader_namespace.h')
-rw-r--r--libnativeloader/native_loader_namespace.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/libnativeloader/native_loader_namespace.h b/libnativeloader/native_loader_namespace.h
index f6a324be56..9a5aeac203 100644
--- a/libnativeloader/native_loader_namespace.h
+++ b/libnativeloader/native_loader_namespace.h
@@ -55,7 +55,11 @@ struct NativeLoaderNamespace {
std::string name() const { return name_; }
bool IsBridged() const { return raw_.index() == 1; }
- Result<void> Link(const NativeLoaderNamespace& target, const std::string& shared_libs) const;
+ // Creates a link from this namespace to target for the ":"-separated list of
+ // libraries in shared_libs. If target is nullptr it creates a link to the
+ // default namespace.
+ Result<void> Link(const NativeLoaderNamespace* target, const std::string& shared_libs) const;
+
Result<void*> Load(const char* lib_name) const;
static Result<NativeLoaderNamespace> GetExportedNamespace(const std::string& name,