eliminate meaningless non-zero values of ramdisk_offset

- Fix: issue #38 - sync change of https://android-review.googlesource.com/c/platform/system/tools/mkbootimg/+/1087679 - also change integrationTest
cfig · May 19, 2020 · b21e856 · b21e856
1 parent e47b10e
commit b21e856
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/bbootimg/src/main/kotlin/bootimg/BootImgHeader.kt b/bbootimg/src/main/kotlin/bootimg/BootImgHeader.kt
@@ -196,6 +196,7 @@ open class BootImgHeader(
         //refresh ramdisk size
         if (0U == this.ramdiskLength) {
             param.ramdisk = null
+            this.ramdiskOffset = 0U
         } else {
             this.ramdiskLength = File(param.ramdisk!!).length().toUInt()
         }

diff --git a/integrationTest.py b/integrationTest.py
@@ -86,6 +86,9 @@ def decompressXZ(inFile, outFile):
             f2.write(file_content)
 
 def main():
+    # from volunteers
+    verifySingleDir(resDir, "recovery_image_from_s-trace")
+    verifySingleDir(resDir, "boot_img_from_gesangtome") # android 9, no ramdisk
     # 5.0
     verifySingleDir(resDir, "5.0_fugu_lrx21m")
     # 6.0
@@ -104,10 +107,6 @@ def main():
     verifySingleDir(resDir, "9.0.0_blueline_pq1a.181105.017.a1")
     # Q preview
     verifySingleDir(resDir, "Q_preview_blueline_qpp2.190228.023")
-
-    # from volunteers
-    verifySingleDir(resDir, "recovery_image_from_s-trace")
-
     # 10
     verifySingleDir(resDir, "10.0.0_coral-qq1d.200205.002")
 

diff --git a/src/integrationTest/resources b/src/integrationTest/resources
+ −		boot_img_from_gesangtome/boot.img.xz
+13 −0		boot_img_from_gesangtome/boot.json