Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(135)

Side by Side Diff: base/native_library_posix.cc

Issue 2048523002: Fix base::GetNativeLibraryName() for Mac. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@native_lib_clean
Patch Set: rebase Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « base/native_library_mac.mm ('k') | base/native_library_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/native_library.h" 5 #include "base/native_library.h"
6 6
7 #include <dlfcn.h> 7 #include <dlfcn.h>
8 8
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/strings/string_util.h"
11 #include "base/strings/utf_string_conversions.h" 12 #include "base/strings/utf_string_conversions.h"
12 #include "base/threading/thread_restrictions.h" 13 #include "base/threading/thread_restrictions.h"
13 14
14 namespace base { 15 namespace base {
15 16
16 std::string NativeLibraryLoadError::ToString() const { 17 std::string NativeLibraryLoadError::ToString() const {
17 return message; 18 return message;
18 } 19 }
19 20
20 // static 21 // static
(...skipping 22 matching lines...) Expand all
43 } 44 }
44 } 45 }
45 46
46 // static 47 // static
47 void* GetFunctionPointerFromNativeLibrary(NativeLibrary library, 48 void* GetFunctionPointerFromNativeLibrary(NativeLibrary library,
48 StringPiece name) { 49 StringPiece name) {
49 return dlsym(library, name.data()); 50 return dlsym(library, name.data());
50 } 51 }
51 52
52 // static 53 // static
53 string16 GetNativeLibraryName(StringPiece16 name) { 54 std::string GetNativeLibraryName(StringPiece name) {
54 return ASCIIToUTF16("lib") + name.as_string() + ASCIIToUTF16(".so"); 55 DCHECK(IsStringASCII(name));
56 return "lib" + name.as_string() + ".so";
55 } 57 }
56 58
57 } // namespace base 59 } // namespace base
OLDNEW
« no previous file with comments | « base/native_library_mac.mm ('k') | base/native_library_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698