This is an archive of the discontinued LLVM Phabricator instance.

Differential D94320

[debugserver] Various plist changes
ClosedPublic

Authored by JDevlieghere on Jan 8 2021, 10:10 AM.

Details

Reviewers
jasonmolenda
Commits
rG272355128f48: [debugserver] Various plist changes
Summary
  • 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

Diff Detail

Event Timeline

JDevlieghere created this revision.Jan 8 2021, 10:10 AM
Herald added a subscriber: mgorny. · View Herald TranscriptJan 8 2021, 10:10 AM
JDevlieghere requested review of this revision.Jan 8 2021, 10:10 AM
jasonmolenda accepted this revision.Jan 8 2021, 1:07 PM

Thanks Jonas, LGTM.

This revision is now accepted and ready to land.Jan 8 2021, 1:07 PM
Closed by commit rG272355128f48: [debugserver] Various plist changes (authored by JDevlieghere). · Explain WhyJan 8 2021, 6:55 PM
This revision was automatically updated to reflect the committed changes.
JDevlieghere added a commit: rG272355128f48: [debugserver] Various plist changes.
Herald added a project: Restricted Project. · View Herald TranscriptJan 8 2021, 6:55 PM

Revision Contents

Diff 315565

lldb/tools/debugserver/debugnub-exports

  • This file was deleted.
_DNB*
__DNB*

lldb/tools/debugserver/resources/debugserver-entitlements.plist

  • This file was moved from lldb/tools/debugserver/source/debugserver-entitlements.plist.
The contents of this file were not changed.

lldb/tools/debugserver/resources/debugserver-macosx-entitlements.plist

  • This file was copied from lldb/tools/debugserver/source/debugserver-macosx-entitlements.plist.
<?xml version="1.0" encoding="UTF-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"> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0"> <plist version="1.0">
<dict> <dict>
<key>com.apple.private.logging.diagnostic</key> <key>com.apple.security.cs.debugger</key>
<true/>
<key>com.apple.private.cs.debugger</key>
<true/> <true/>
</dict> </dict>
</plist> </plist>

lldb/tools/debugserver/resources/debugserver-macosx-private-entitlements.plist

  • This file was moved from lldb/tools/debugserver/source/debugserver-macosx-entitlements.plist.
The contents of this file were not changed.

lldb/tools/debugserver/source/CMakeLists.txt

Show First 20 Lines • Show All 54 Lines • ▼ Show 20 Linesfunction(get_debugserver_codesign_identity result)
# Ad-hoc signing: last resort # Ad-hoc signing: last resort
set(${result} "-" PARENT_SCOPE) set(${result} "-" PARENT_SCOPE)
endfunction() endfunction()
# debugserver does not depend on intrinsics_gen, or on llvm. Set the common # debugserver does not depend on intrinsics_gen, or on llvm. Set the common
# llvm dependencies in the current scope to the empty set. # llvm dependencies in the current scope to the empty set.
set(LLVM_COMMON_DEPENDS) 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" check_cxx_compiler_flag("-Wno-gnu-zero-variadic-macro-arguments"
CXX_SUPPORTS_NO_GNU_ZERO_VARIADIC_MACRO_ARGUMENTS) CXX_SUPPORTS_NO_GNU_ZERO_VARIADIC_MACRO_ARGUMENTS)
if (CXX_SUPPORTS_NO_GNU_ZERO_VARIADIC_MACRO_ARGUMENTS) if (CXX_SUPPORTS_NO_GNU_ZERO_VARIADIC_MACRO_ARGUMENTS)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-gnu-zero-variadic-macro-arguments") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-gnu-zero-variadic-macro-arguments")
endif () endif ()
check_cxx_compiler_flag("-Wno-zero-length-array" check_cxx_compiler_flag("-Wno-zero-length-array"
▲ Show 20 Lines • Show All 51 Lines • ▼ Show 20 Lines
if(HAVE_LIBCOMPRESSION) if(HAVE_LIBCOMPRESSION)
set(LIBCOMPRESSION compression) set(LIBCOMPRESSION compression)
endif() endif()
if(LLDB_USE_ENTITLEMENTS) if(LLDB_USE_ENTITLEMENTS)
if(APPLE_EMBEDDED) if(APPLE_EMBEDDED)
set(entitlements ${CMAKE_CURRENT_SOURCE_DIR}/debugserver-entitlements.plist) set(entitlements ${CMAKE_CURRENT_SOURCE_DIR}/debugserver-entitlements.plist)
else() else()
# Same entitlements file as used for lldb-server if (LLDB_USE_PRIVATE_ENTITLEMENTS)
set(entitlements ${LLDB_SOURCE_DIR}/resources/debugserver-macosx-entitlements.plist) set(entitlements ${DEBUGSERVER_RESOURCE_DIR}/debugserver-macosx-entitlements.plist)
else()
set(entitlements ${DEBUGSERVER_RESOURCE_DIR}/debugserver-macosx-private-entitlements.plist)
endif()
endif() endif()
endif() endif()
add_definitions(-DLLDB_USE_OS_LOG) add_definitions(-DLLDB_USE_OS_LOG)
if(${CMAKE_OSX_SYSROOT} MATCHES ".Internal.sdk$") if(${CMAKE_OSX_SYSROOT} MATCHES ".Internal.sdk$")
message(STATUS "LLDB debugserver energy support is enabled") message(STATUS "LLDB debugserver energy support is enabled")
add_definitions(-DLLDB_ENERGY) add_definitions(-DLLDB_ENERGY)
▲ Show 20 Lines • Show All 171 Lines • Show Last 20 Lines

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

  • This file was deleted.
<?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>

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

  • This file was deleted.
<?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>

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

  • This file was deleted.
<?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>

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

  • This file was deleted.
<?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>

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

  • This file was deleted.
<?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>

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

  • This file was deleted.
<?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>

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

  • This file was deleted.
<?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>

lldb/tools/debugserver/source/debugserver-entitlements.plist

  • This file was moved to lldb/tools/debugserver/resources/debugserver-entitlements.plist.

lldb/tools/debugserver/source/debugserver-macosx-entitlements.plist

  • This file was deleted after being copied to lldb/tools/debugserver/resources/debugserver-macosx-entitlements.plist, lldb/tools/debugserver/resources/debugserver-macosx-private-entitlements.plist.
The contents of this file were not changed.
lldb/tools/debugserver/source/com.apple.debugserver.internal.plist