Merge "Make lldb default for gdbclient.py" am: e8ab4475ea am: 4cb07a4dd3 am: cb0d905d85

Original change: https://android-review.googlesource.com/c/platform/development/+/1427156

Change-Id: I650427b29b09ee786764ce8a238bea57f41aed6a

python-packages/gdbrunner/__init__.py

@@ -189,6 +189,11 @@ def start_gdbserver(device, gdbserver_local_path, gdbserver_remote_path,
     if run_as_cmd:
         gdbserver_cmd = run_as_cmd + gdbserver_cmd
 
+    if lldb:
+        gdbserver_output_path = os.path.join(tempfile.gettempdir(),
+                                             "lldb-client.log")
+        print("Redirecting lldb-server output to {}".format(gdbserver_output_path))
+    else:
         gdbserver_output_path = os.path.join(tempfile.gettempdir(),
                                              "gdbclient.log")
         print("Redirecting gdbserver output to {}".format(gdbserver_output_path))

scripts/gdbclient.py

@@ -437,7 +437,10 @@ def do_main():
         linker_search_dir = ensure_linker(device, sysroot, interp)
 
         tracer_pid = get_tracer_pid(device, pid)
-        use_lldb = args.lldb
+        if os.path.basename(__file__) == 'gdbclient.py' and not args.lldb:
+            print("gdb is deprecated in favor of lldb. "
+                  "If you can't use lldb, please set --no-lldb and file a bug asap.")
+        use_lldb = not args.no_lldb
         if tracer_pid == 0:
             cmd_prefix = args.su_cmd
             if args.env:

scripts/lldbclient.py

@@ -0,0 +1 @@
+gdbclient.py