From a01591339b6c6c4426c4f087c32d75edf1d0fb98 Mon Sep 17 00:00:00 2001
From: Martin Stjernholm <mast@google.com>
Date: Wed, 7 Feb 2024 18:31:38 +0000
Subject: Improve debug logging to reflect all code paths in OpenNativeLibrary.

Also some related code cleanups.

Test: atest libnativeloader_e2e_tests \
        libnativeloader_test libnativeloader_lazy_test
Bug: 237577392
Change-Id: Ia8842cdaf84d282353f3b0c55ca3d56bbc3bd4aa
---
 libnativeloader/library_namespaces.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'libnativeloader/library_namespaces.h')

diff --git a/libnativeloader/library_namespaces.h b/libnativeloader/library_namespaces.h
index 25edf4faf7..741d4116b8 100644
--- a/libnativeloader/library_namespaces.h
+++ b/libnativeloader/library_namespaces.h
@@ -22,6 +22,7 @@
 #endif
 
 #include <list>
+#include <optional>
 #include <string>
 
 #include "android-base/result.h"
@@ -93,7 +94,7 @@ class LibraryNamespaces {
   std::list<std::pair<jweak, NativeLoaderNamespace>> namespaces_;
 };
 
-Result<std::string> FindApexNamespaceName(const std::string& location);
+std::optional<std::string> FindApexNamespaceName(const std::string& location);
 
 }  // namespace android::nativeloader
 
-- 
cgit v1.2.3-59-g8ed1b