Move locator/path conversion logic to workspace_lib.
Locators can be used by several workspace objects (blueprints, bricks,
etc..).
This CL:
* moves the locator to path conversion logic to workspace_lib.
* extracts FriendlyName logic into workspace_lib so preserve
encapsulation.
BUG=brillo:625
TEST=unittests
Change-Id: Ie9c48a2f47871fdc42f23571bf84fe5cb08f72ef
Reviewed-on: https://chromium-review.googlesource.com/261595
Trybot-Ready: Bertrand Simonnet <bsimonnet@chromium.org>
Tested-by: Bertrand Simonnet <bsimonnet@chromium.org>
Reviewed-by: Gilad Arnold <garnold@chromium.org>
Commit-Queue: Bertrand Simonnet <bsimonnet@chromium.org>
diff --git a/scripts/cros_setup_toolchains.py b/scripts/cros_setup_toolchains.py
index 48b4650..cc2d3ab 100644
--- a/scripts/cros_setup_toolchains.py
+++ b/scripts/cros_setup_toolchains.py
@@ -12,12 +12,12 @@
import os
from chromite.cbuildbot import constants
-from chromite.lib import brick_lib
from chromite.lib import commandline
from chromite.lib import cros_build_lib
from chromite.lib import osutils
from chromite.lib import parallel
from chromite.lib import toolchain
+from chromite.lib import workspace_lib
# Needs to be after chromite imports.
import lddtree
@@ -582,7 +582,7 @@
Args:
name: The board name or brick locator to query.
"""
- if brick_lib.IsLocator(name):
+ if workspace_lib.IsLocator(name):
toolchains = toolchain.GetToolchainsForBrick(name)
else:
toolchains = toolchain.GetToolchainsForBoard(name)