Move the updater.sh call into after the assert call. Pack the modem.bin with the zip.

Change-Id: I4cd28ab72100b28b1d71b3f22c58dfa375f312ac

3 files changed, 27 insertions, 2 deletions

diff --git a/releasetools/aries_edify_generator.py b/releasetools/aries_edify_generator.py
index 8beb707..71c5c2b 100644
--- a/releasetools/aries_edify_generator.py
+++ b/releasetools/aries_edify_generator.py
@@ -17,12 +17,22 @@ import os, sys
 
 LOCAL_DIR = os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), '..'))
 RELEASETOOLS_DIR = os.path.abspath(os.path.join(LOCAL_DIR, '../../../build/tools/releasetools'))
+VENDOR_SAMSUNG_DIR = os.path.abspath(os.path.join(LOCAL_DIR, '../../../vendor/samsung'))
 
 import edify_generator
 
 class EdifyGenerator(edify_generator.EdifyGenerator):
-    def RunBackup(self, command):
-      edify_generator.EdifyGenerator.RunBackup(self, command)
+    def AssertDevice(self, device):
+      edify_generator.EdifyGenerator(self, device)
+
+      self.script.append('ui_print("Checking state of BML/MTD...");')
+
+      self.script.append(
+            ('package_extract_file("modem.bin, "/tmp/modem.bin");\n'
+             'set_perm(0, 0, 0777, "/tmp/modem.bin");'))
+      self.script.append(
+            ('package_extract_file("updater.sh", "/tmp/updater.sh");\n'
+             'set_perm(0, 0, 0777, "/tmp/updater.sh");'))
       self.script.append(
             ('package_extract_file("updater.sh", "/tmp/updater.sh");\n'
              'set_perm(0, 0, 0777, "/tmp/updater.sh");'))
@@ -45,6 +55,9 @@ class EdifyGenerator(edify_generator.EdifyGenerator):
       self.script.append('package_extract_file("boot.img", "/tmp/boot.img");')
       self.script.append('run_program("/tmp/updater.sh");')
 
+    def RunBackup(self, command):
+      edify_generator.EdifyGenerator.RunBackup(self, command)
+
     def WriteBMLoverMTD(self, partition, partition_start_block, reservoirpartition, reservoir_start_block, image):
       """Write the given package file into the given partition."""
 
diff --git a/releasetools/aries_ota_from_target_files b/releasetools/aries_ota_from_target_files
index dd2ae66..3616302 100755
--- a/releasetools/aries_ota_from_target_files
+++ b/releasetools/aries_ota_from_target_files
@@ -41,6 +41,7 @@ def CopyBootFiles(input_zip, output_zip):
 
 def CopyBMLoverMTD(output_zip):
   """Copy the bml_over_mtd utility and script to the output."""
+  output_zip.write(os.path.join(TARGET_DIR, "modem.bin"),"modem.bin")
   output_zip.write(os.path.join(UTILITIES_DIR, "make_ext4fs"),"make_ext4fs")
   output_zip.write(os.path.join(UTILITIES_DIR, "busybox"),"busybox")
   output_zip.write(os.path.join(UTILITIES_DIR, "flash_image"),"flash_image")
diff --git a/shbootimg.mk b/shbootimg.mk
index 44bf27a..1450e2c 100644
--- a/shbootimg.mk
+++ b/shbootimg.mk
@@ -1,3 +1,5 @@
+LOCAL_PATH := $(call my-dir)
+
 INSTALLED_BOOTIMAGE_TARGET := $(PRODUCT_OUT)/boot.img
 $(INSTALLED_BOOTIMAGE_TARGET): $(TARGET_PREBUILT_KERNEL) $(recovery_ramdisk) $(INSTALLED_RAMDISK_TARGET) $(PRODUCT_OUT)/utilities/flash_image $(PRODUCT_OUT)/utilities/busybox $(PRODUCT_OUT)/utilities/make_ext4fs $(PRODUCT_OUT)/utilities/erase_image
 	$(call pretty,"Boot image: $@")
@@ -6,3 +8,12 @@ $(INSTALLED_BOOTIMAGE_TARGET): $(TARGET_PREBUILT_KERNEL) $(recovery_ramdisk) $(I
 $(INSTALLED_RECOVERYIMAGE_TARGET): $(INSTALLED_BOOTIMAGE_TARGET)
 	$(ACP) $(INSTALLED_BOOTIMAGE_TARGET) $@
 
+PRODUCT_COPY_FILES += vendor/samsung/$(TARGET_DEVICE)/proprietary/modem.bin:modem.bin
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := modem.bin
+LOCAL_MODULE_TAGS := eng
+LOCAL_MODULE_CLASS := EXECUTABLES
+LOCAL_MODULE_PATH := $(PRODUCT_OUT)
+LOCAL_SRC_FILES := ../../../vendor/samsung/$(TARGET_DEVICE)/proprietary/modem.bin
+include $(BUILD_PREBUILT)