finish build_target_lib.get_default_sysroot_path migration [reland]
This allows us to drop the build_target_lib import from cros_build_lib.
The failing platform2 code that caused this to revert before has been
fixed, and cs/ doesn't show any other latent hits.
BUG=chromium:1170007
TEST=CQ passes
Change-Id: I284d99fc2570eff7c4e843140efdfe5a56acc8d5
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2814898
Tested-by: Mike Frysinger <vapier@chromium.org>
Auto-Submit: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Sergey Frolov <sfrolov@google.com>
Reviewed-by: Sergey Frolov <sfrolov@google.com>
diff --git a/scripts/cros_generate_sysroot.py b/scripts/cros_generate_sysroot.py
index 14c8d08..e9d7e0f 100644
--- a/scripts/cros_generate_sysroot.py
+++ b/scripts/cros_generate_sysroot.py
@@ -12,6 +12,7 @@
import os
+from chromite.lib import build_target_lib
from chromite.lib import constants
from chromite.lib import cros_build_lib
from chromite.lib import commandline
@@ -83,7 +84,7 @@
def _InstallBuildDependencies(self):
# Calculate buildtime deps that are not runtime deps.
- raw_sysroot = cros_build_lib.GetSysroot(board=self.options.board)
+ raw_sysroot = build_target_lib.get_default_sysroot_path(self.options.board)
packages = []
if not self.options.deps_only:
packages = self.options.package.split()