maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[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
This commit is contained in:
Jonas Devlieghere 2021-01-08 18:53:08 -08:00
parent 7a204362f5
commit 272355128f
12 changed files with 17 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lldb/tools/debugserver/debugnub-exports
View File

@ -1,2 +0,0 @@
_DNB*
__DNB*

0
lldb/tools/debugserver/source/debugserver-entitlements.plist → lldb/tools/debugserver/resources/debugserver-entitlements.plist
View File

8
lldb/tools/debugserver/resources/debugserver-macosx-entitlements.plist Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>com.apple.security.cs.debugger</key>
<true/>
</dict>
</plist>

0
lldb/tools/debugserver/source/debugserver-macosx-entitlements.plist → lldb/tools/debugserver/resources/debugserver-macosx-private-entitlements.plist
View File

12
lldb/tools/debugserver/source/CMakeLists.txt
View File

@ -60,7 +60,10 @@ endfunction()
# llvm dependencies in the current scope to the empty set.
set(LLVM_COMMON_DEPENDS)
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")
set(DEBUGSERVER_RESOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../resources")
set(DEBUGSERVER_INFO_PLIST "${DEBUGSERVER_RESOURCE_DIR}/lldb-debugserver-Info.plist")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++ -Wl,-sectcreate,__TEXT,__info_plist,${DEBUGSERVER_INFO_PLIST}")
check_cxx_compiler_flag("-Wno-gnu-zero-variadic-macro-arguments"
CXX_SUPPORTS_NO_GNU_ZERO_VARIADIC_MACRO_ARGUMENTS)
@ -128,8 +131,11 @@ if(LLDB_USE_ENTITLEMENTS)
if(APPLE_EMBEDDED)
set(entitlements ${CMAKE_CURRENT_SOURCE_DIR}/debugserver-entitlements.plist)
else()
# Same entitlements file as used for lldb-server
set(entitlements ${LLDB_SOURCE_DIR}/resources/debugserver-macosx-entitlements.plist)
if (LLDB_USE_PRIVATE_ENTITLEMENTS)
set(entitlements ${DEBUGSERVER_RESOURCE_DIR}/debugserver-macosx-entitlements.plist)
else()
set(entitlements ${DEBUGSERVER_RESOURCE_DIR}/debugserver-macosx-private-entitlements.plist)
endif()
endif()
endif()

16
lldb/tools/debugserver/source/com.apple.debugserver.applist.internal.plist
View File

@ -1,16 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>Label</key>
<string>com.apple.debugserver.applist.internal</string>
<key>ProgramArguments</key>
<array>
<string>/Developer/usr/bin/debugserver</string>
<string>--lockdown</string>
<string>--applist</string>
</array>
<key>AllowByProxy</key>
<true/>
</dict>
</plist>

19
lldb/tools/debugserver/source/com.apple.debugserver.applist.plist
View File

@ -1,19 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>Label</key>
<string>com.apple.debugserver.applist</string>
<key>UserName</key>
<string>mobile</string>
<key>ProgramArguments</key>
<array>
<string>/Developer/usr/bin/debugserver</string>
<string>--lockdown</string>
<string>--applist</string>
<string>--launch=frontboard</string>
</array>
<key>AllowByProxy</key>
<true/>
</dict>
</plist>

15
lldb/tools/debugserver/source/com.apple.debugserver.internal.plist
View File

@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>Label</key>
<string>com.apple.debugserver.internal</string>
<key>ProgramArguments</key>
<array>
<string>/Developer/usr/bin/debugserver</string>
<string>--lockdown</string>
</array>
<key>AllowByProxy</key>
<true/>
</dict>
</plist>

18
lldb/tools/debugserver/source/com.apple.debugserver.plist
View File

@ -1,18 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>Label</key>
<string>com.apple.debugserver</string>
<key>UserName</key>
<string>mobile</string>
<key>ProgramArguments</key>
<array>
<string>/Developer/usr/bin/debugserver</string>
<string>--lockdown</string>
<string>--launch=frontboard</string>
</array>
<key>AllowByProxy</key>
<true/>
</dict>
</plist>

16
lldb/tools/debugserver/source/com.apple.debugserver.posix.internal.plist
View File

@ -1,16 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>Label</key>
<string>com.apple.debugserver.posix.internal</string>
<key>ProgramArguments</key>
<array>
<string>/Developer/usr/bin/debugserver</string>
<string>--lockdown</string>
<string>--launch=posix</string>
</array>
<key>AllowByProxy</key>
<true/>
</dict>
</plist>

18
lldb/tools/debugserver/source/com.apple.debugserver.posix.plist
View File

@ -1,18 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>Label</key>
<string>com.apple.debugserver.posix</string>
<key>UserName</key>
<string>mobile</string>
<key>ProgramArguments</key>
<array>
<string>/Developer/usr/bin/debugserver</string>
<string>--lockdown</string>
<string>--launch=posix</string>
</array>
<key>AllowByProxy</key>
<true/>
</dict>
</plist>

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

@ -1,35 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>Label</key>
<string>com.apple.internal.xpc.remote.debugserver</string>
<key>RemoteServices</key>
<dict>
<key>com.apple.internal.debugserver</key>
<dict>
<key>RequireEntitlement</key>
<string>AppleInternal</string>
<key>ExposedToUntrustedDevices</key>
<true/>
</dict>
</dict>
<key>ProgramArguments</key>
<array>
<string>/usr/libexec/remotectl</string>
<string>trampoline</string>
<string>-2</string>
<string>42</string>
<string>com.apple.internal.debugserver</string>
<string>/usr/local/bin/debugserver-nonui</string>
<string>--fd</string>
<string>42</string>
</array>
<key>POSIXSpawnType</key>
<string>Interactive</string>
<key>EnableTransactions</key>
<true/>
<key>EnablePressuredExit</key>
<true/>
</dict>
</plist>