summaryrefslogtreecommitdiff
path: root/libnativeloader/library_namespaces.cpp
diff options
context:
space:
mode:
author Martin Stjernholm <mast@google.com> 2024-11-28 15:22:05 +0000
committer Martin Stjernholm <mast@google.com> 2024-11-28 20:11:17 +0000
commita24e2c255173070c5e354f501bc28e4c7e8d77da (patch)
tree88c9d931a25ecc8a0cc924d18b393c44fecdc983 /libnativeloader/library_namespaces.cpp
parentcca3341e67fd9f45362448428abd47da09cdb954 (diff)
Make NativeLoaderNamespace instances immutable.
To make it easier to reason about thread safety. Test: atest libnativeloader_e2e_tests libnativeloader_test \ art_libnativeloader_cts_test libnativeloader_lazy_test Bug: 326505705 Bug: 326610154 Change-Id: I2447ed8120625823d3298d392d22828af2c22402
Diffstat (limited to 'libnativeloader/library_namespaces.cpp')
-rw-r--r--libnativeloader/library_namespaces.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/libnativeloader/library_namespaces.cpp b/libnativeloader/library_namespaces.cpp
index 7aa14080ce..b27b268d16 100644
--- a/libnativeloader/library_namespaces.cpp
+++ b/libnativeloader/library_namespaces.cpp
@@ -432,10 +432,10 @@ Result<NativeLoaderNamespace*> LibraryNamespaces::Create(JNIEnv* env,
const std::string product_libs =
filter_public_libraries(target_sdk_version, uses_libraries, product_public_libraries());
if (!product_libs.empty()) {
- Result<NativeLoaderNamespace> target_ns = system_ns;
- if (is_product_treblelized()) {
- target_ns = NativeLoaderNamespace::GetExportedNamespace(kProductNamespaceName, is_bridged);
- }
+ Result<NativeLoaderNamespace> target_ns =
+ is_product_treblelized()
+ ? NativeLoaderNamespace::GetExportedNamespace(kProductNamespaceName, is_bridged)
+ : system_ns;
if (target_ns.ok()) {
linked = app_ns->Link(&target_ns.value(), product_libs);
if (!linked.ok()) {