Skip to content

Commit 2723551

Browse files
committed
[debugserver] Various plist changes
- Remove unused plists that were referenced (but unused) by Xcode. - Move all debugserver plists unders tools/debugserver/resources. - Add the ability to distinguish between com.apple.security.cs.debugger and com.apple.private.cs.debugger. rdar://66082043 Differential revision: https://reviews.llvm.org/D94320
1 parent 7a20436 commit 2723551

12 files changed

+17
-142
lines changed

lldb/tools/debugserver/debugnub-exports

Lines changed: 0 additions & 2 deletions
This file was deleted.
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>com.apple.security.cs.debugger</key>
6+
<true/>
7+
</dict>
8+
</plist>

lldb/tools/debugserver/source/CMakeLists.txt

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,10 @@ endfunction()
6060
# llvm dependencies in the current scope to the empty set.
6161
set(LLVM_COMMON_DEPENDS)
6262

63-
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++ -Wl,-sectcreate,__TEXT,__info_plist,${CMAKE_CURRENT_SOURCE_DIR}/../resources/lldb-debugserver-Info.plist")
63+
set(DEBUGSERVER_RESOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../resources")
64+
set(DEBUGSERVER_INFO_PLIST "${DEBUGSERVER_RESOURCE_DIR}/lldb-debugserver-Info.plist")
65+
66+
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++ -Wl,-sectcreate,__TEXT,__info_plist,${DEBUGSERVER_INFO_PLIST}")
6467

6568
check_cxx_compiler_flag("-Wno-gnu-zero-variadic-macro-arguments"
6669
CXX_SUPPORTS_NO_GNU_ZERO_VARIADIC_MACRO_ARGUMENTS)
@@ -128,8 +131,11 @@ if(LLDB_USE_ENTITLEMENTS)
128131
if(APPLE_EMBEDDED)
129132
set(entitlements ${CMAKE_CURRENT_SOURCE_DIR}/debugserver-entitlements.plist)
130133
else()
131-
# Same entitlements file as used for lldb-server
132-
set(entitlements ${LLDB_SOURCE_DIR}/resources/debugserver-macosx-entitlements.plist)
134+
if (LLDB_USE_PRIVATE_ENTITLEMENTS)
135+
set(entitlements ${DEBUGSERVER_RESOURCE_DIR}/debugserver-macosx-entitlements.plist)
136+
else()
137+
set(entitlements ${DEBUGSERVER_RESOURCE_DIR}/debugserver-macosx-private-entitlements.plist)
138+
endif()
133139
endif()
134140
endif()
135141

lldb/tools/debugserver/source/com.apple.debugserver.applist.internal.plist

Lines changed: 0 additions & 16 deletions
This file was deleted.

lldb/tools/debugserver/source/com.apple.debugserver.applist.plist

Lines changed: 0 additions & 19 deletions
This file was deleted.

lldb/tools/debugserver/source/com.apple.debugserver.internal.plist

Lines changed: 0 additions & 15 deletions
This file was deleted.

lldb/tools/debugserver/source/com.apple.debugserver.plist

Lines changed: 0 additions & 18 deletions
This file was deleted.

lldb/tools/debugserver/source/com.apple.debugserver.posix.internal.plist

Lines changed: 0 additions & 16 deletions
This file was deleted.

lldb/tools/debugserver/source/com.apple.debugserver.posix.plist

Lines changed: 0 additions & 18 deletions
This file was deleted.

lldb/tools/debugserver/source/com.apple.internal.xpc.remote.debugserver.plist

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)