blob: 95fd459e0170d8c6f06b3b91b7a7c56049328536 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
|
--- mojo/public/c/system/thunks.cc.orig 2021-07-19 18:45:18 UTC
+++ mojo/public/c/system/thunks.cc
@@ -20,7 +20,7 @@
#include "mojo/public/c/system/core.h"
#include "mojo/public/c/system/macros.h"
-#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN)
+#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
#include "base/environment.h"
#include "base/files/file_path.h"
#include "base/scoped_native_library.h"
@@ -68,7 +68,7 @@ class CoreLibraryInitializer {
~CoreLibraryInitializer() = default;
MojoResult LoadLibrary(base::FilePath library_path) {
-#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN)
+#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
if (library_ && library_->is_valid())
return MOJO_RESULT_OK;
@@ -82,7 +82,7 @@ class CoreLibraryInitializer {
if (library_path.empty()) {
// Default to looking for the library in the current working directory.
-#if defined(OS_CHROMEOS) || defined(OS_LINUX)
+#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD)
const base::FilePath::CharType kDefaultLibraryPathValue[] =
FILE_PATH_LITERAL("./libmojo_core.so");
#elif defined(OS_WIN)
@@ -126,13 +126,13 @@ class CoreLibraryInitializer {
library_ = std::move(library);
return MOJO_RESULT_OK;
-#else // defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN)
+#else // defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
return MOJO_RESULT_UNIMPLEMENTED;
-#endif // defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN)
+#endif // defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
}
private:
-#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN)
+#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
absl::optional<base::ScopedNativeLibrary> library_;
#endif
};
|
