This reverts commit 8be0f39fec7f26164fd0791ff6d15bde65fc849c to reland
the change that removes EXPAND/STRINGIFY macros.

It's error-prone by putting anything into a string (e.g.
forgot to pass -DRECOVERY_API_VERSION=3).

The initial attempt put RECOVERY_API_VERSION into common.h, which might
be included by device-specific codes but without defining that when
compiling the module. This CL avoids the issue by using a constant
in the header, with a static_assert in recovery.cpp that guards the

Test: recovery_component_test
Test: Sideload OTAs on bullhead and sailfish respectively.
Change-Id: I12af3f73392a85554ba703f04970ec9d984ccbaa
3 files changed
tree: 4e9b138c4234d80b88cc856effa3f55e340044f5
  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. .clang-format
  23. adb_install.cpp
  24. adb_install.h
  25. Android.bp
  27. asn1_decoder.cpp
  28. asn1_decoder.h
  29. bootloader.h
  31. common.h
  32. default_device.cpp
  33. device.cpp
  34. device.h
  35. error_code.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
  43. mounts.cpp
  44. mounts.h
  45. NOTICE
  46. OWNERS
  47. print_sha1.h
  48. rangeset.h
  50. recovery-persist.cpp
  51. recovery-persist.rc
  52. recovery-refresh.cpp
  53. recovery-refresh.rc
  54. recovery.cpp
  55. roots.cpp
  56. roots.h
  57. rotate_logs.cpp
  58. rotate_logs.h
  59. screen_ui.cpp
  60. screen_ui.h
  61. stub_ui.h
  62. ui.cpp
  63. ui.h
  64. verifier.cpp
  65. verifier.h
  66. vr_device.cpp
  67. vr_ui.cpp
  68. vr_ui.h
  69. wear_device.cpp
  70. wear_ui.cpp
  71. wear_ui.h

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.