commit 16deba10d9f485429bda10c988f3a24470198978
author Treehugger Robot <treehugger-gerrit@google.com> Tue Sep 15 20:24:56 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Sep 15 20:24:56 2020 +0000
tree dd09d861957145aafdf6d4458c98c24fd2f19ea4
parent 10987326b1a5a7003b3e40fd63e27908bc1c9552
parent 84eeb1a8e6d6cbfede15dcec68851269614219ff

Merge "Show a warning if adb is not root before gdbclient.py" am: 84eeb1a8e6

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

Change-Id: Ifa7d06ba1e55f8dbff15b37a9a09bf1ac65c4b78

python-packages/gdbrunner/__init__.py

diff --git a/python-packages/gdbrunner/__init__.py b/python-packages/gdbrunner/__init__.py
index f399d73..d2a557f 100644
--- a/python-packages/gdbrunner/__init__.py
+++ b/python-packages/gdbrunner/__init__.py
@@ -197,8 +197,20 @@
                               stderr=gdbserver_output)
 
 
+def get_uid(device):
+    """Gets the uid adbd runs as."""
+    line, _ = device.shell(["id", "-u"])
+    return int(line.strip())
+
+
 def forward_gdbserver_port(device, local, remote):
     """Forwards local TCP port `port` to `remote` via `adb forward`."""
+    if get_uid(device) != 0:
+        WARNING = '\033[93m'
+        ENDC = '\033[0m'
+        print(WARNING +
+              "Port forwarding may not work because adbd is not running as root. " +
+              " Run `adb root` to fix." + ENDC)
     device.forward("tcp:{}".format(local), remote)
     atexit.register(lambda: device.forward_remove("tcp:{}".format(local)))
 
@@ -370,4 +382,4 @@
         except KeyboardInterrupt:
             pass
 
-    os.unlink(script_path)
\ No newline at end of file
+    os.unlink(script_path)