hwid: Move {hwdb,hwid} to cros.factory.hwid.{v2,v3}
There were two folders "hwdb" and "hwid" in factory repository which in fact
controls v2 and v3 HWID.
To make it simple, we are creating an extra folder "cros.factory.hwid" and
move these two folders there and change folder name to "v2" and "v3".
BUG=chromium:557573
TEST=make test
Change-Id: Ia16010b33cbacd64761ec9b62ce4435e2ab3de7a
Reviewed-on: https://chromium-review.googlesource.com/313857
Commit-Ready: Hung-Te Lin <hungte@chromium.org>
Tested-by: Hung-Te Lin <hungte@chromium.org>
Reviewed-by: Hung-Te Lin <hungte@chromium.org>
diff --git a/py/gooftool/gooftool.py b/py/gooftool/gooftool.py
index cf0fb32..004d6cc 100755
--- a/py/gooftool/gooftool.py
+++ b/py/gooftool/gooftool.py
@@ -38,10 +38,10 @@
from cros.factory.gooftool.vpd_data import KNOWN_VPD_FIELD_DATA
from cros.factory.hacked_argparse import CmdArg, Command, ParseCmdline
from cros.factory.hacked_argparse import verbosity_cmd_arg
-from cros.factory.hwdb import hwid_tool
-from cros.factory.hwdb.yaml_datastore import YamlWrite
-from cros.factory.hwid import common
-from cros.factory.hwid import hwid_utils
+from cros.factory.hwid.v2 import hwid_tool
+from cros.factory.hwid.v2.yaml_datastore import YamlWrite
+from cros.factory.hwid.v3 import common
+from cros.factory.hwid.v3 import hwid_utils
from cros.factory.test import event_log
from cros.factory.test import factory
from cros.factory.test.factory import FACTORY_LOG_PATH, DEVICE_STATEFUL_PATH