From a24e2c255173070c5e354f501bc28e4c7e8d77da Mon Sep 17 00:00:00 2001 From: Martin Stjernholm Date: Thu, 28 Nov 2024 15:22:05 +0000 Subject: 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 --- libnativeloader/library_namespaces.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libnativeloader/library_namespaces.cpp') 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 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 target_ns = system_ns; - if (is_product_treblelized()) { - target_ns = NativeLoaderNamespace::GetExportedNamespace(kProductNamespaceName, is_bridged); - } + Result 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()) { -- cgit v1.2.3-59-g8ed1b