Gitiles
Code Review Sign In
review.shift-gmbh.com / SHIFTPHONES / android_bootable_recovery / 3afe5f56916302784b428d027ad138359d832dbd
commit3afe5f56916302784b428d027ad138359d832dbd[log] [tgz]
authorAlex Deymo <deymo@google.com>Wed Nov 08 12:26:44 2017 +0100
committerAlex Deymo <deymo@google.com>Wed Nov 08 12:29:58 2017 +0100
tree84a2cdb644433a5a889af21c67fe9cf05034f017
parent16b8b8fd1cf9055c9206ddfced90847b21acc340 [diff]
Include bspatch.h from bsdiff/

The function ApplyBSDiffPatch() defined in bspatch.cpp is declared in
applypatch.h, but it includes "bspatch.h" from the bsdiff/ project,
which is at least confusing. There is no "bspatch.h" in this repo, so
the include actually reffers to the one in bsdiff. This patch uses the
"bsdiff/bspatch.h" form instead to avoid confusion.

Bug: None
Test: It builds.

Change-Id: I6b6ffd6725b2b34ff644aed93683f69779103661
1 file changed
tree: 84a2cdb644433a5a889af21c67fe9cf05034f017
  1. applypatch/
  2. boot_control/
  3. bootloader_message/
  4. edify/
  5. etc/
  6. fonts/
  7. minadbd/
  8. minui/
  9. otafault/
  10. otautil/
  11. private/
  12. res-hdpi/
  13. res-mdpi/
  14. res-xhdpi/
  15. res-xxhdpi/
  16. res-xxxhdpi/
  17. tests/
  18. tools/
  19. uncrypt/
  20. update_verifier/
  21. updater/
  22. res-560dpi ⇨ res-xxxhdpi
  23. .clang-format
  24. adb_install.cpp
  25. adb_install.h
  26. Android.bp
  27. Android.mk
  28. asn1_decoder.cpp
  29. asn1_decoder.h
  30. bootloader.h
  31. CleanSpec.mk
  32. common.h
  33. default_device.cpp
  34. device.cpp
  35. device.h
  36. fuse_sdcard_provider.cpp
  37. fuse_sdcard_provider.h
  38. fuse_sideload.cpp
  39. fuse_sideload.h
  40. install.cpp
  41. install.h
  42. interlace-frames.py
  43. mounts.cpp
  44. mounts.h
  45. NOTICE
  46. OWNERS
  47. PREUPLOAD.cfg
  48. README.md
  49. recovery-persist.cpp
  50. recovery-persist.rc
  51. recovery-refresh.cpp
  52. recovery-refresh.rc
  53. recovery.cpp
  54. roots.cpp
  55. roots.h
  56. rotate_logs.cpp
  57. rotate_logs.h
  58. screen_ui.cpp
  59. screen_ui.h
  60. stub_ui.h
  61. ui.cpp
  62. ui.h
  63. verifier.cpp
  64. verifier.h
  65. vr_device.cpp
  66. vr_ui.cpp
  67. vr_ui.h
  68. wear_device.cpp
  69. wear_ui.cpp
  70. 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

Running the tests

# After setting up environment and lunch.
mmma -j bootable/recovery

# Running the tests on device.
adb root
adb sync data

# 32-bit device
adb shell /data/nativetest/recovery_unit_test/recovery_unit_test
adb shell /data/nativetest/recovery_component_test/recovery_component_test

# Or 64-bit device
adb shell /data/nativetest64/recovery_unit_test/recovery_unit_test
adb shell /data/nativetest64/recovery_component_test/recovery_component_test

Running the manual tests

recovery-refresh and recovery-persist executables exist only on systems without /cache partition. And we need to follow special steps to run tests for them.

  • Execute the test on an A/B device first. The test should fail but it will log some contents to pmsg.

  • Reboot the device immediately and run the test again. The test should save the contents of pmsg buffer into /data/misc/recovery/inject.txt. Test will pass if this file has expected contents.

ResourceTest validates whether the png files are qualified as background text image under recovery.

1. `adb sync data` to make sure the test-dir has the images to test.
2. The test will automatically pickup and verify all `_text.png` files in
   the test dir.