commit 662fb72a47ad63bd94948d0020ebbe0a11c0633b
author Achuith Bhandarkar <achuith@chromium.org> Thu Oct 31 16:12:49 2019 -0700
committer Commit Bot <commit-bot@chromium.org> Wed Nov 06 08:59:19 2019 +0000
tree 92432740f14c7655856ed9b029ad08829124d923
parent ed053dc9548fb1d551a4b02f35412e734399341c

xbuddy: Remove xbuddy files from platform.

Delete the following files:
android_build.py
artifact_info.py
build_artifact.py
build_artifact_unittest.py
build_util.py
common_util.py
common_util_unittest.py
devserver_constants.py
downloader.py
downloader_unittest.py
log_util.py
retry.py
xbuddy.py
xbuddy_unittest.py
shadow_xbuddy_config.ini
xbuddy_config.ini

Update the imports in the following files:
autoupdate.py
autoupdate_unittest.py
builder.py
cros_update_progress.py
devserver.py
devserver_integration_test.py
health_checker.py

Rename log_util.py to cherrypy_log_util.py

Remove files from Makefile

Fix lint errors in builder.py

Patchset 1 is the file deletion, subsequent patchsets have code changes.

BUG=chromium:1003986
TEST=unittests, cros flash, devserver_integration_test

Cq-Depend: chromium:1894475
Change-Id: I4e70d0971eda00263a69906a6c1b11a3014d947c
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/dev-util/+/1893644
Tested-by: Achuith Bhandarkar <achuith@chromium.org>
Reviewed-by: Amin Hassani <ahassani@chromium.org>
Commit-Queue: Achuith Bhandarkar <achuith@chromium.org>

autoupdate.py

diff --git a/autoupdate.py b/autoupdate.py
index bbc4b6c..5485fb2 100644
--- a/autoupdate.py
+++ b/autoupdate.py
@@ -16,11 +16,6 @@
 
 import cherrypy  # pylint: disable=import-error
 
-import build_util
-import common_util
-import devserver_constants as constants
-import log_util
-
 # TODO(crbug.com/872441): We try to import nebraska from different places
 # because when we install the devserver, we copy the nebraska.py into the main
 # directory. Once this bug is resolved, we can always import from nebraska
@@ -30,11 +25,16 @@
 except ImportError:
   import nebraska
 
+import setup_chromite  # pylint: disable=unused-import
+from chromite.lib.xbuddy import build_util
+from chromite.lib.xbuddy import cherrypy_log_util
+from chromite.lib.xbuddy import common_util
+from chromite.lib.xbuddy import devserver_constants as constants
+
 
 # Module-local log function.
 def _Log(message, *args):
-  return log_util.LogWithTag('UPDATE', message, *args)
-
+  return cherrypy_log_util.LogWithTag('UPDATE', message, *args)
 
 class AutoupdateError(Exception):
   """Exception classes used by this module."""