commit d8d25cdd41261fcc7dcfe1baf7a1b8a965faf183
author Mike Frysinger <vapier@chromium.org> Tue Apr 06 11:39:17 2021 -0400
committer Commit Bot <commit-bot@chromium.org> Wed Apr 07 18:36:41 2021 +0000
tree 8a1c70959cfb67cd3dcd2ead4d0e29701ed7128e
parent 4af59c3c20c6cd9b892b3ce6f5b77e980eb87ec9

finish build_target_lib.get_default_sysroot_path migration

This allows us to drop the build_target_lib import from cros_build_lib.

BUG=chromium:1170007
TEST=CQ passes

Change-Id: Icf01d140baa482014acfca800a57db7bb1bdc934
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2810800
Reviewed-by: Sergey Frolov <sfrolov@google.com>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>

scripts/cros_gdb.py

diff --git a/scripts/cros_gdb.py b/scripts/cros_gdb.py
index 413154d..5000160 100644
--- a/scripts/cros_gdb.py
+++ b/scripts/cros_gdb.py
@@ -19,6 +19,7 @@
 import tempfile
 
 from chromite.cli.cros import cros_chrome_sdk
+from chromite.lib import build_target_lib
 from chromite.lib import commandline
 from chromite.lib import constants
 from chromite.lib import cros_build_lib
@@ -187,7 +188,7 @@
     self.in_chroot = self.IsInChroot()
     self.prompt = '(%s-gdb) ' % self.board
     if self.in_chroot:
-      self.sysroot = cros_build_lib.GetSysroot(board=self.board)
+      self.sysroot = build_target_lib.get_default_sysroot_path(self.board)
       self.inf_cmd = self.RemoveSysrootPrefix(self.inf_cmd)
       self.cross_gdb = self.GetCrossGdb()
     else:
@@ -635,8 +636,9 @@
     gdb_args = options.gdb_args
 
   if inf_cmd:
-    fname = os.path.join(cros_build_lib.GetSysroot(options.board),
-                         inf_cmd.lstrip('/'))
+    fname = os.path.join(
+        build_target_lib.get_default_sysroot_path(options.board),
+        inf_cmd.lstrip('/'))
     if not os.path.exists(fname):
       cros_build_lib.Die('Cannot find program %s.' % fname)
   else: