commit 17afc657d1cb0f9bde97288d946313e20d0b6a2a
author The Android Automerger <android-build@android.com> Fri Oct 12 10:26:08 2012 -0700
committer The Android Automerger <android-build@android.com> Fri Oct 12 10:26:08 2012 -0700
tree 4a0e16a0cd20b5456799e6b0f48da2fa1dde166c
parent 5a1ed8026cc425eed2b1ea4022b59a6ac39f4632
parent e80527299dece877e05d216d34d354fda4ccd539

merge in jb-mr1-factory-release history after reset to jb-mr1-dev

releasetools.py

diff --git a/releasetools.py b/releasetools.py
index 086f4cd..dba721e 100644
--- a/releasetools.py
+++ b/releasetools.py
@@ -26,9 +26,9 @@
     WriteBootloader(info, bootloader_bin)
 
   try:
-    radio_img = info.input_zip.read("RADIO/SAM_6260_ALL.fls")
+    radio_img = info.input_zip.read("RADIO/radio.raw")
   except KeyError:
-    print "no SAM_6260_ALL.fls in target_files; skipping install"
+    print "no radio.raw in target_files; skipping install"
   else:
     WriteRadio(info, radio_img)
 
@@ -49,9 +49,9 @@
     print "no bootloader.raw in target target_files; skipping install"
 
   try:
-    target_radio_img = info.target_zip.read("RADIO/SAM_6260_ALL.fls")
+    target_radio_img = info.target_zip.read("RADIO/radio.raw")
     try:
-      source_radio_img = info.source_zip.read("RADIO/SAM_6260_ALL.fls")
+      source_radio_img = info.source_zip.read("RADIO/radio.raw")
     except KeyError:
       source_radio_img = None
 
@@ -60,7 +60,7 @@
     else:
       WriteRadio(info, target_radio_img)
   except KeyError:
-    print "no radio.img in target_files; skipping install"
+    print "no radio.raw in target_files; skipping install"
 
 
 def WriteBootloader(info, bootloader_bin):
@@ -73,10 +73,13 @@
                           (fstab["/staging"].device,))
 
 def WriteRadio(info, radio_img):
-  common.ZipWriteStr(info.output_zip, "SAM_6260_ALL.fls", radio_img)
+  common.ZipWriteStr(info.output_zip, "radio.raw", radio_img)
   fstab = info.info_dict["fstab"]
 
   info.script.Print("Writing radio...")
-  info.script.AppendExtra("""assert(package_extract_file("SAM_6260_ALL.fls", "/tmp/SAM_6260_ALL.fls"),
-                          bach.update_modem("/tmp/SAM_6260_ALL.fls"),
-                          delete("/tmp/SAM_6260_ALL.fls"));""")
+
+  info.script.AppendExtra("""assert(package_extract_file("radio.raw", "%s"),
+                          mount("ext4", "EMMC", "%s", "/radio"),
+                          bach.update_modem("/radio/SAM_6260_ALL.fls"),
+                          unmount("/radio"));""" %
+                          (fstab["/radio"].device, fstab["/radio"].device))