support for per-partition fs_type (do not merge)
Include the recovery.fstab file in the recovery image. Remove the
global fs_type and partition_type values from the target-files
key/value dict, and parse the recovery.fstab file instead to find
types for each partition.
Change-Id: I35ee2dd0989441dc2a704b63c1b32e598049acb5
diff --git a/tools/releasetools/ota_from_target_files b/tools/releasetools/ota_from_target_files
index 37715bc..320c6fc 100755
--- a/tools/releasetools/ota_from_target_files
+++ b/tools/releasetools/ota_from_target_files
@@ -363,10 +363,10 @@
script.ShowProgress(0.5, 0)
if OPTIONS.wipe_user_data:
- script.FormatPartition("userdata")
+ script.FormatPartition("/data")
- script.FormatPartition("system")
- script.Mount("system", "/system")
+ script.FormatPartition("/system")
+ script.Mount("/system")
script.UnpackPackageDir("recovery", "/system")
script.UnpackPackageDir("system", "/system")
@@ -387,7 +387,7 @@
script.ShowProgress(0.2, 0)
script.ShowProgress(0.2, 10)
- script.WriteRawImage("boot", "boot.img")
+ script.WriteRawImage("/boot", "boot.img")
script.ShowProgress(0.1, 0)
device_specific.FullOTA_InstallEnd()
@@ -500,7 +500,7 @@
metadata["pre-build"] = source_fp
metadata["post-build"] = target_fp
- script.Mount("system", "/system")
+ script.Mount("/system")
script.AssertSomeFingerprint(source_fp, target_fp)
source_boot = common.File("/tmp/boot.img",
@@ -564,7 +564,7 @@
if OPTIONS.wipe_user_data:
script.Print("Erasing user data...")
- script.FormatPartition("userdata")
+ script.FormatPartition("/data")
script.Print("Removing unneeded files...")
script.DeleteFiles(["/"+i[0] for i in verbatim_targets] +