Gitiles
Code Review Sign In
gerrit.twrp.me / android_bootable_recovery / 0779fc98147a298eda6475c7744c5957ac382740
commit0779fc98147a298eda6475c7744c5957ac382740[log] [tgz]
authorDavid Riley <davidriley@google.com>Thu Dec 10 10:18:25 2015 -0800
committerDavid Riley <davidriley@google.com>Wed Dec 23 09:43:59 2015 -0800
treed4b4909d30b7122a373de764dc718e1ea5567da7
parent29b0fbe160f815a142fa0d056c1ce10186cea516 [diff]
imgdiff: skip spurious gzip headers in image files

dragon kernel is compressed via lz4 for boot speed and bootloader
support reasons and recent prebuilts happen to include the gzip header
sequence which is causing imgdiff to fail.

Detect a spurious gzip header and treat the section as a normal section.

Bug: 26133184
Change-Id: I369d7d576fd7d2c579c0780fc5c669a5b6ea0d3d
(cherry picked from commit 0f2f6a746af517afca9e5e089a4a17be0a9766d6)
Signed-off-by: David Riley <davidriley@google.com>
1 file changed
tree: d4b4909d30b7122a373de764dc718e1ea5567da7
  1. applypatch/
  2. edify/
  3. etc/
  4. fonts/
  5. minadbd/
  6. minui/
  7. minzip/
  8. mtdutils/
  9. res-hdpi/
  10. res-mdpi/
  11. res-xhdpi/
  12. res-xxhdpi/
  13. res-xxxhdpi/
  14. testdata/
  15. tests/
  16. tools/
  17. uncrypt/
  18. update_verifier/
  19. updater/
  20. res-560dpi ⇨ res-xxhdpi
  21. adb_install.cpp
  22. adb_install.h
  23. Android.mk
  24. asn1_decoder.cpp
  25. asn1_decoder.h
  26. bootloader.cpp
  27. bootloader.h
  28. CleanSpec.mk
  29. common.h
  30. default_device.cpp
  31. device.cpp
  32. device.h
  33. fuse_sdcard_provider.cpp
  34. fuse_sdcard_provider.h
  35. fuse_sideload.cpp
  36. fuse_sideload.h
  37. install.cpp
  38. install.h
  39. interlace-frames.py
  40. NOTICE
  41. print_sha1.h
  42. README.md
  43. recovery.cpp
  44. roots.cpp
  45. roots.h
  46. screen_ui.cpp
  47. screen_ui.h
  48. ui.cpp
  49. ui.h
  50. unique_fd.h
  51. verifier.cpp
  52. verifier.h
  53. verifier_test.cpp
  54. verifier_test.sh
  55. wear_ui.cpp
  56. wear_ui.h
README.md

The Recovery Image

Quick turn-around testing

mm -j && m ramdisk-nodeps && m recoveryimage-nodeps

# To boot into the new recovery image
# without flashing the recovery partition:
adb reboot bootloader
fastboot boot $ANDROID_PRODUCT_OUT/recovery.img