LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Uses lldb wrapper if exists for gdbclient.py

Browse Source 
Bug: 161853714
Change-Id: I3c19e06195569d46889d4c967cdab1fc5c7e39b8
This commit is contained in:
Haibo Huang
2020-07-22 16:37:35 -07:00
parent fa60f334c3
commit e4d8bfdfa1
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/gdbclient.py
View File

@@ -62,6 +62,14 @@ def get_gdbserver_path(root, arch):
return path.format(root, arch, "") return path.format(root, arch, "")
def get_lldb_path(toolchain_path):
for lldb_name in ['lldb.sh', 'lldb.cmd', 'lldb', 'lldb.exe']:
debugger_path = os.path.join(toolchain_path, "bin", lldb_name)
if os.path.isfile(debugger_path):
return debugger_path
return None
def get_lldb_server_path(root, clang_base, clang_version, arch): def get_lldb_server_path(root, clang_base, clang_version, arch):
arch = { arch = {
'arm': 'arm', 'arm': 'arm',
@@ -457,7 +465,7 @@ def do_main():
remote="tcp:{}".format(args.port)) remote="tcp:{}".format(args.port))
if use_lldb: if use_lldb:
debugger_path = os.path.join(toolchain_path, "bin", "lldb") debugger_path = get_lldb_path(toolchain_path)
debugger = 'lldb' debugger = 'lldb'
else: else:
debugger_path = os.path.join( debugger_path = os.path.join(