Changeset 269788 in webkit
- Timestamp:
- Nov 13, 2020 1:11:18 PM (3 years ago)
- Location:
- trunk/Source/WebKit
- Files:
-
- 1 deleted
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/ChangeLog
r269785 r269788 1 2020-11-13 Alex Christensen <achristensen@webkit.org> 2 3 Remove more SecItemShim leftovers 4 https://bugs.webkit.org/show_bug.cgi?id=218919 5 6 Reviewed by Geoffrey Garen. 7 8 * Configurations/SecItemShim.xcconfig: Removed. 9 * NetworkProcess/EntryPoint/Cocoa/XPCService/NetworkServiceEntryPoint.mm: 10 (NETWORK_SERVICE_INITIALIZER): 11 * PlatformMac.cmake: 12 * WebKit.xcodeproj/project.pbxproj: 13 1 14 2020-11-12 Darin Adler <darin@apple.com> 2 15 -
trunk/Source/WebKit/NetworkProcess/EntryPoint/Cocoa/XPCService/NetworkServiceEntryPoint.mm
r252083 r269788 56 56 { 57 57 WTF::initializeMainThread(); 58 59 // Remove the SecItemShim from the DYLD_INSERT_LIBRARIES environment variable so any processes spawned by60 // the this process don't try to insert the shim and crash.61 EnvironmentUtilities::removeValuesEndingWith("DYLD_INSERT_LIBRARIES", "/SecItemShim.dylib");62 58 XPCServiceInitializer<NetworkProcess, NetworkServiceInitializerDelegate>(adoptOSObject(connection), initializerMessage, priorityBoostMessage); 63 59 } -
trunk/Source/WebKit/PlatformMac.cmake
r266342 r269788 137 137 NetworkProcess/EntryPoint/Cocoa/XPCService/NetworkServiceEntryPoint.mm 138 138 ${XPCService_SOURCES} 139 )140 141 list(APPEND NetworkProcess_LIBRARIES142 SecItemShim143 139 ) 144 140 … … 458 454 endforeach () 459 455 460 set(SecItemShimDirectory ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/WebKit.framework/Versions/A/Frameworks)461 add_library(SecItemShim SHARED WebProcess/mac/SecItemShimLibrary.mm)462 WEBKIT_CREATE_SYMLINK(SecItemShim ${SecItemShimDirectory} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/WebKit.framework/Frameworks)463 set_target_properties(SecItemShim PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${SecItemShimDirectory})464 set_target_properties(SecItemShim PROPERTIES PREFIX "")465 target_link_libraries(SecItemShim ${SECURITY_LIBRARY})466 target_include_directories(SecItemShim PRIVATE467 ${CMAKE_BINARY_DIR}468 ${FORWARDING_HEADERS_DIR}469 ${WEBKIT_DIR}470 )471 add_dependencies(SecItemShim WebCore)472 473 456 # FIXME: These should not be necessary. 474 457 file(WRITE ${FORWARDING_HEADERS_DIR}/WebKit/WKImageCG.h "#import <WebKit/Shared/API/c/cg/WKImageCG.h>") -
trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj
r269785 r269788 4666 4666 A1EDD2D91884ACE000BBFE98 /* All.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = All.xcconfig; sourceTree = "<group>"; }; 4667 4667 A1EDD2DB1884B96400BBFE98 /* PluginProcessShim.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = PluginProcessShim.xcconfig; sourceTree = "<group>"; }; 4668 A1EDD2DC1884B9B500BBFE98 /* SecItemShim.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = SecItemShim.xcconfig; sourceTree = "<group>"; };4669 4668 A1FB68221F6E518200C43F9F /* WKCrashReporter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WKCrashReporter.h; sourceTree = "<group>"; }; 4670 4669 A1FB68231F6E518200C43F9F /* WKCrashReporter.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = WKCrashReporter.mm; sourceTree = "<group>"; }; … … 5959 5958 37E83D401B37D27B002079EE /* SandboxProfiles.xcconfig */, 5960 5959 A1B89B92221E023300EB4CEA /* SDKVariant.xcconfig */, 5961 A1EDD2DC1884B9B500BBFE98 /* SecItemShim.xcconfig */,5962 5960 5183B3931379F85C00E8754E /* Shim.xcconfig */, 5963 5961 1A4F976E100E7B6600637A18 /* Version.xcconfig */,
Note: See TracChangeset
for help on using the changeset viewer.