Synced repos to: 60208

1 files changed, 9 insertions, 4 deletions

diff --git a/image_chromeos.py b/image_chromeos.py
index 17812d4d..f1497fb9 100755
--- a/image_chromeos.py
+++ b/image_chromeos.py
@@ -18,6 +18,7 @@ import sys
 import tempfile
 from utils import command_executer
 from utils import logger
+from utils import misc
 from utils.file_utils import FileUtils
 
 checksum_file = "/usr/local/osimage_checksum_file"
@@ -68,10 +69,14 @@ def Main(argv):
     board = options.board
 
   if options.image is None:
-    image = (options.chromeos_root +
-             "/src/build/images/" + board +
-             "/latest/" +
-             "/chromiumos_image.bin")
+    images_dir = misc.GetImageDir(options.chromeos_root, board)
+    image = os.path.join(images_dir,
+                         "latest",
+                         "chromiumos_test_image.bin")
+    if not os.path.exists(image):
+      image = os.path.join(images_dir,
+                           "latest",
+                           "chromiumos_image.bin")
   else:
     image = options.image
     image = os.path.expanduser(image)