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

Side by Side Diff: base/native_library_mac.mm

Issue 2048523002: Fix base::GetNativeLibraryName() for Mac. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@native_lib_clean
Patch Set: Remove string16 version of GetNativeLibraryName 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
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 #include <mach-o/getsect.h> 8 #include <mach-o/getsect.h>
9 9
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 106
107 // If this library hasn't been tested for having ObjC, use the function 107 // If this library hasn't been tested for having ObjC, use the function
108 // pointer to look up the section information for the library. 108 // pointer to look up the section information for the library.
109 if (function_pointer && library->objc_status == OBJC_UNKNOWN) 109 if (function_pointer && library->objc_status == OBJC_UNKNOWN)
110 library->objc_status = GetObjCStatusForImage(function_pointer); 110 library->objc_status = GetObjCStatusForImage(function_pointer);
111 111
112 return function_pointer; 112 return function_pointer;
113 } 113 }
114 114
115 // static 115 // static
116 string16 GetNativeLibraryName(StringPiece16 name) { 116 std::string GetNativeLibraryName(StringPiece name) {
117 return name.as_string() + ASCIIToUTF16(".dylib"); 117 return "lib" + name.as_string() + ".dylib";
118 } 118 }
119 119
120 } // namespace base 120 } // namespace base
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698