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

Merge "gdbclient: use host ip when connecting to gdb" am: 7a89ee5b1b am: e1113109b9 am: faec52fde5 am: cac84dd712

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/development/+/2056834

Change-Id: Ib293bdb34b6e1413d4f758e2f3eb48d8eb6909c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Edward Liaw
2022-04-07 20:42:19 +00:00
committed by Automerger Merge Worker
parent d381506987 cac84dd712
commit 76cb22b7a8
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
scripts/gdbclient.py
View File

@@ -242,7 +242,7 @@ def handle_switches(args, sysroot):
return (binary_file, pid, run_cmd) return (binary_file, pid, run_cmd)
def generate_vscode_lldb_script(root, sysroot, binary_name, port, solib_search_path): def generate_vscode_lldb_script(root, sysroot, binary_name, host, port, solib_search_path):
# TODO It would be nice if we didn't need to copy this or run the # TODO It would be nice if we didn't need to copy this or run the
# lldbclient.py program manually. Doing this would probably require # lldbclient.py program manually. Doing this would probably require
# writing a vscode extension or modifying an existing one. # writing a vscode extension or modifying an existing one.
@@ -258,11 +258,11 @@ def generate_vscode_lldb_script(root, sysroot, binary_name, port, solib_search_p
"initCommands": ['settings append target.exec-search-paths {}'.format(' '.join(solib_search_path))], "initCommands": ['settings append target.exec-search-paths {}'.format(' '.join(solib_search_path))],
"targetCreateCommands": ["target create {}".format(binary_name), "targetCreateCommands": ["target create {}".format(binary_name),
"target modules search-paths add / {}/".format(sysroot)], "target modules search-paths add / {}/".format(sysroot)],
"processCreateCommands": ["gdb-remote {}".format(port)] "processCreateCommands": ["gdb-remote {}:{}".format(host, port)]
} }
return json.dumps(res, indent=4) return json.dumps(res, indent=4)
def generate_lldb_script(root, sysroot, binary_name, port, solib_search_path): def generate_lldb_script(root, sysroot, binary_name, host, port, solib_search_path):
commands = [] commands = []
commands.append( commands.append(
'settings append target.exec-search-paths {}'.format(' '.join(solib_search_path))) 'settings append target.exec-search-paths {}'.format(' '.join(solib_search_path)))
@@ -272,11 +272,11 @@ def generate_lldb_script(root, sysroot, binary_name, port, solib_search_path):
commands.append("settings append target.source-map '/b/f/w' '{}'".format(root)) commands.append("settings append target.source-map '/b/f/w' '{}'".format(root))
commands.append("settings append target.source-map '' '{}'".format(root)) commands.append("settings append target.source-map '' '{}'".format(root))
commands.append('target modules search-paths add / {}/'.format(sysroot)) commands.append('target modules search-paths add / {}/'.format(sysroot))
commands.append('gdb-remote {}'.format(port)) commands.append('gdb-remote {}:{}'.format(host, port))
return '\n'.join(commands) return '\n'.join(commands)
def generate_setup_script(debugger_path, sysroot, linker_search_dir, binary_file, is64bit, port, debugger, connect_timeout=5): def generate_setup_script(debugger_path, sysroot, linker_search_dir, binary_file, is64bit, host, port, debugger, connect_timeout=5):
# Generate a setup script. # Generate a setup script.
root = os.environ["ANDROID_BUILD_TOP"] root = os.environ["ANDROID_BUILD_TOP"]
symbols_dir = os.path.join(sysroot, "system", "lib64" if is64bit else "lib") symbols_dir = os.path.join(sysroot, "system", "lib64" if is64bit else "lib")
@@ -292,10 +292,10 @@ def generate_setup_script(debugger_path, sysroot, linker_search_dir, binary_file
if debugger == "vscode-lldb": if debugger == "vscode-lldb":
return generate_vscode_lldb_script( return generate_vscode_lldb_script(
root, sysroot, binary_file.name, port, solib_search_path) root, sysroot, binary_file.name, host, port, solib_search_path)
elif debugger == 'lldb': elif debugger == 'lldb':
return generate_lldb_script( return generate_lldb_script(
root, sysroot, binary_file.name, port, solib_search_path) root, sysroot, binary_file.name, host, port, solib_search_path)
else: else:
raise Exception("Unknown debugger type " + debugger) raise Exception("Unknown debugger type " + debugger)
@@ -314,6 +314,11 @@ def do_main():
if device is None: if device is None:
sys.exit("ERROR: Failed to find device.") sys.exit("ERROR: Failed to find device.")
if ":" in device.serial:
host = device.serial.split(":")[0]
else:
host = "localhost"
root = os.environ["ANDROID_BUILD_TOP"] root = os.environ["ANDROID_BUILD_TOP"]
sysroot = os.path.join(os.environ["ANDROID_PRODUCT_OUT"], "symbols") sysroot = os.path.join(os.environ["ANDROID_PRODUCT_OUT"], "symbols")
@@ -379,6 +384,7 @@ def do_main():
linker_search_dir=linker_search_dir, linker_search_dir=linker_search_dir,
binary_file=binary_file, binary_file=binary_file,
is64bit=is64bit, is64bit=is64bit,
host=host,
port=args.port, port=args.port,
debugger=debugger) debugger=debugger)