Commit Graph

6644 Commits

Author SHA1 Message Date
Tianjie Xu 9b15aac2fa Merge "Add an updater function to compute hash tree" am: dbe4420325 am: b5bc978432 am: f82ff97029
am: eb316575d6

Change-Id: I644941d43f4c84ed7c7665a9f219c4f5d3d2f0b3
2018-08-06 21:06:19 -07:00
Tao Bao 6e1b0c3310 Merge "Dynamically load device-specific recovery UI lib." am: 9cf9b689d9 am: 75acf24207 am: 39259af890
am: 50bb0bcfd0

Change-Id: Ib83124c79bdcfa3a79c830e074e883733eaf9c79
2018-08-06 20:56:27 -07:00
Tianjie Xu eb316575d6 Merge "Add an updater function to compute hash tree" am: dbe4420325 am: b5bc978432
am: f82ff97029

Change-Id: I5ccf2e886af1076f0af97b36dc87fbf73501e744
2018-08-06 16:23:14 -07:00
Tianjie Xu f82ff97029 Merge "Add an updater function to compute hash tree" am: dbe4420325
am: b5bc978432

Change-Id: Ie876da6cd0c875431124d09619c2c04d71900d4d
2018-08-06 16:04:15 -07:00
Tao Bao 50bb0bcfd0 Merge "Dynamically load device-specific recovery UI lib." am: 9cf9b689d9 am: 75acf24207
am: 39259af890

Change-Id: I44e057b36e1bb3fa53059736f0f9e2fcbfc014a4
2018-08-06 16:00:06 -07:00
Tao Bao 39259af890 Merge "Dynamically load device-specific recovery UI lib." am: 9cf9b689d9
am: 75acf24207

Change-Id: I9a836dc442058856ab4dc71ccccc96029d3194cf
2018-08-06 15:45:52 -07:00
Tianjie Xu b5bc978432 Merge "Add an updater function to compute hash tree"
am: dbe4420325

Change-Id: If426801d3494be02404c8e4f6d4f064fd6540a4d
2018-08-06 15:36:55 -07:00
Tao Bao 75acf24207 Merge "Dynamically load device-specific recovery UI lib."
am: 9cf9b689d9

Change-Id: I73e3fdc01ff4b51fd18272980ce1360b0bc069f7
2018-08-06 15:32:57 -07:00
Tianjie Xu dbe4420325 Merge "Add an updater function to compute hash tree" 2018-08-06 22:19:04 +00:00
Tao Bao 9cf9b689d9 Merge "Dynamically load device-specific recovery UI lib." 2018-08-06 21:46:10 +00:00
Tao Bao 42c45e2b66 Dynamically load device-specific recovery UI lib.
We used to statically link the device-specific recovery UI extension
(`TARGET_RECOVERY_UI_LIB`) into `recovery`. Such a logic can't be easily
migrated to Soong, as modules specified by `TARGET_RECOVERY_UI_LIB` may
not be built with Soong.

Instead of porting all the device-specific codes over, this CL builds
and installs the UI lib as a shared library with Android.mk. `recovery`
dlopen(3)'s and dlsym(3)'s `make_device` to invoke the device-specific
UI lib on start.

Note that in order to make dlopen(3) actually working, we have to switch
`recovery` to be dynamically linked (we will make the move later
anyway).

Bug: 110380063
Test: Build and boot into marlin recovery image. Check that
      device-specific recovery UI is successfully loaded.
Change-Id: Ia9861c7559a95f3f50676534540c0cb87cae4574
2018-08-06 12:35:23 -07:00
Tianjie Xu 69ffa15338 Add an updater function to compute hash tree
The new command is part of the transfer.list and allows us to compute the hash
tree on non-ab devices.

The required arguments for the hash_tree computation are:
  hash_tree_ranges
  source_ranges
  hash_algorithm
  salt_hex
  root_hash

Bug: 25170618
Test: unit tests pass;  run simulator with compute_hash_tree
Change-Id: I8ff0d582cc8adabb8a060db7845f38b35b28e62c
2018-08-06 12:17:50 -07:00
Tao Bao a5a12d5a4f Merge "minui: Move to Soong." am: f2bc68cfe1 am: ea105889a5 am: bf40c42766
am: 151fbba314

Change-Id: Ic671d306f38e89955941b53f770da234622a4936
2018-08-06 11:26:18 -07:00
Tao Bao 151fbba314 Merge "minui: Move to Soong." am: f2bc68cfe1 am: ea105889a5
am: bf40c42766

Change-Id: Ibdb66b0d0f5a5be54dcf6fd9f9797439292af406
2018-08-06 11:12:20 -07:00
Tao Bao bf40c42766 Merge "minui: Move to Soong." am: f2bc68cfe1
am: ea105889a5

Change-Id: Iee4d709563685c7a79aed0e4b9887805c413fb32
2018-08-06 11:08:10 -07:00
Tao Bao ea105889a5 Merge "minui: Move to Soong."
am: f2bc68cfe1

Change-Id: Iab9a892a3d4d691884e4709c288de1d122d67473
2018-08-06 10:58:16 -07:00
Tao Bao f2bc68cfe1 Merge "minui: Move to Soong." 2018-08-06 17:29:50 +00:00
Tao Bao 7ee83f627e minui: Move to Soong.
Note that although libminui says "shared_libs" in Android.bp file,
`recovery` binary will still statically link the libs, until we drop the
`LOCAL_FORCE_STATIC_EXECUTABLE := true` flag from `recovery` module.

Bug: 110380063
Test: `mmma -j bootable/recovery` with aosp_taimen-userdebug
Test: Boot into recovery and `Run graphics test`.
Change-Id: I48785d161dfe52eb01667e938d9c3f0a497b61a2
2018-08-05 14:42:26 -07:00
Tao Bao 18834739eb Merge "minui: Use runtime properties instead of build time vars." am: ebc04d1e7a am: ce0409a560 am: 8f545f4c8c
am: f0e0fff6ea

Change-Id: If440cae460cb8c13e9c30905f146e27d9f5fe38b
2018-08-03 17:11:48 -07:00
Tao Bao 06fcb36167 Merge "ui: Read custom recovery UI values via system property." am: 2117b4bd07 am: 17bf8d0518 am: 814468deb5
am: 00c9829f4a

Change-Id: I7e5c4e93c01919913efc9d73608c5a4df703163f
2018-08-03 17:11:37 -07:00
Tao Bao f0e0fff6ea Merge "minui: Use runtime properties instead of build time vars." am: ebc04d1e7a am: ce0409a560
am: 8f545f4c8c

Change-Id: I152c9afe31255d5329475fffd19e48a4f17dc792
2018-08-03 16:56:41 -07:00
Tao Bao 00c9829f4a Merge "ui: Read custom recovery UI values via system property." am: 2117b4bd07 am: 17bf8d0518
am: 814468deb5

Change-Id: I6f3120621d06cabf123ec5052cb7ace0f6cb6dde
2018-08-03 16:56:30 -07:00
Tao Bao 8f545f4c8c Merge "minui: Use runtime properties instead of build time vars." am: ebc04d1e7a
am: ce0409a560

Change-Id: Icf0f15841560ece076c33fbc15425d800d656441
2018-08-03 16:28:19 -07:00
Tao Bao 814468deb5 Merge "ui: Read custom recovery UI values via system property." am: 2117b4bd07
am: 17bf8d0518

Change-Id: I2e40e9e62be581fc5fdf3479b851c259909b0184
2018-08-03 16:28:11 -07:00
Tao Bao ce0409a560 Merge "minui: Use runtime properties instead of build time vars."
am: ebc04d1e7a

Change-Id: Ied0cc8732e0c5d75d1608c4aaa637c04548ecfe6
2018-08-03 16:02:25 -07:00
Tao Bao 17bf8d0518 Merge "ui: Read custom recovery UI values via system property."
am: 2117b4bd07

Change-Id: Ia9e2d805f2e90b9be8426010581a32d0b27fe8e6
2018-08-03 16:02:17 -07:00
Tao Bao ebc04d1e7a Merge "minui: Use runtime properties instead of build time vars." 2018-08-03 21:51:20 +00:00
Tao Bao 2117b4bd07 Merge "ui: Read custom recovery UI values via system property." 2018-08-03 21:51:20 +00:00
Zhomart Mukhamejanov 67b66c019a Merge "Remove non-A/B mention from README." am: f8b04fe48d am: a5d6a661c6 am: e9775341be
am: 2e63f41b4e

Change-Id: I3721d1dd7f091539d2b37ef488e8abbc21654d29
2018-08-01 18:24:00 -07:00
Zhomart Mukhamejanov 2e63f41b4e Merge "Remove non-A/B mention from README." am: f8b04fe48d am: a5d6a661c6
am: e9775341be

Change-Id: If6b73c231f81b3029c4b475deb42849ab594ecb7
2018-08-01 18:01:37 -07:00
Zhomart Mukhamejanov e9775341be Merge "Remove non-A/B mention from README." am: f8b04fe48d
am: a5d6a661c6

Change-Id: If168c6ac766a70ed3f8cf82203d8be478fd87f14
2018-08-01 17:57:34 -07:00
Zhomart Mukhamejanov a5d6a661c6 Merge "Remove non-A/B mention from README."
am: f8b04fe48d

Change-Id: Ia46aa857b64b8c344181941013cf2ced7832034f
2018-08-01 17:55:14 -07:00
Zhomart Mukhamejanov f8b04fe48d Merge "Remove non-A/B mention from README." 2018-08-02 00:44:28 +00:00
Zhomart Mukhamejanov c0ec9135d5 Remove non-A/B mention from README.
Test: N/A
Change-Id: I8622733d0a23ff062031a67efd0e32480a297322
2018-08-01 15:38:16 -07:00
Tao Bao ed876a7175 minui: Use runtime properties instead of build time vars.
This CL removes the use of the following build time macros, and uses the
runtime property values instead.
- TARGET_RECOVERY_PIXEL_FORMAT
- TARGET_RECOVERY_OVERSCAN_PERCENT
- TARGET_RECOVERY_DEFAULT_ROTATION

Bug: 110380063
Test: Set up taimen with `TARGET_RECOVERY_DEFAULT_ROTATION := ROTATION_LEFT`.
      Build and check recovery UI.
Test: Set up taimen with `TARGET_RECOVERY_PIXEL_FORMAT := ABGR_8888`.
      Build and check recovery UI.
Change-Id: I4439556a03fde4805a18011ef72eff1373f31d47
2018-08-01 15:36:41 -07:00
Tao Bao caaf964272 Merge "minui: Clean up the use of rotation." am: a9ef617aa7 am: f22aeefaed am: f4e7bec485
am: 48f06f134b

Change-Id: If98b52938bd58ab437c7f46bafa9471e3acd6b55
2018-08-01 14:48:45 -07:00
Tao Bao 48f06f134b Merge "minui: Clean up the use of rotation." am: a9ef617aa7 am: f22aeefaed
am: f4e7bec485

Change-Id: Id55014e43e3e97dc773f7e309902831b93c6b2f8
2018-08-01 14:39:07 -07:00
Tao Bao f4e7bec485 Merge "minui: Clean up the use of rotation." am: a9ef617aa7
am: f22aeefaed

Change-Id: I00374d34eaa826b417fead0c14f4b6b803f61fe2
2018-08-01 14:36:06 -07:00
Tao Bao f22aeefaed Merge "minui: Clean up the use of rotation."
am: a9ef617aa7

Change-Id: Id87dce642ff0c8352c4dea2266cbd08558b20145
2018-08-01 14:30:11 -07:00
Tao Bao a9ef617aa7 Merge "minui: Clean up the use of rotation." 2018-08-01 21:20:01 +00:00
Tao Bao 44478dfb7d minui: Clean up the use of rotation.
This CL uses scoped enum for GRRotation. It also refactors the previous
comparisions to improve readability -- it was hard to tell the meaning
of `if (rotation % 2)` unless by checking the exact values.

It also temporarily adds STRINGFY to expand the macro of
DEFAULT_ROTATION. This will be removed once minui is changed from
reading build time vars to runtime properties.

Test: Build and boot into recovery image on marlin.
Test: Set `TARGET_RECOVERY_DEFAULT_ROTATION := ROTATION_LEFT` and check
      the display under recovery with `Run graphics test`.
Change-Id: Ieb08b1cd13c284f8dcf906cb2a1430c6bae2835b
2018-08-01 12:30:27 -07:00
Jaegeuk Kim c141bad787 Merge "uncrypt: fix f2fs ioctl argument for pin_file" am: 42f40cd370 am: 03f6185ea6 am: 4adfcf962f
am: e0b4784c09

Change-Id: I02a6691639fdba038a0b707a5d24e747f253f38a
2018-08-01 00:36:53 -07:00
Jaegeuk Kim e0b4784c09 Merge "uncrypt: fix f2fs ioctl argument for pin_file" am: 42f40cd370 am: 03f6185ea6
am: 4adfcf962f

Change-Id: I2efec91672b2772fdde4d7f474e7366f7f5c07a8
2018-08-01 00:31:21 -07:00
Jaegeuk Kim 4adfcf962f Merge "uncrypt: fix f2fs ioctl argument for pin_file" am: 42f40cd370
am: 03f6185ea6

Change-Id: I8f185f14b4d0e21f1708f422c914ad5b9b871f5c
2018-08-01 00:27:20 -07:00
Jaegeuk Kim 03f6185ea6 Merge "uncrypt: fix f2fs ioctl argument for pin_file"
am: 42f40cd370

Change-Id: I54a58ded52eb11cc6ba2834feda3ad22f4658407
2018-08-01 00:22:16 -07:00
Treehugger Robot 42f40cd370 Merge "uncrypt: fix f2fs ioctl argument for pin_file" 2018-08-01 07:18:19 +00:00
Jaegeuk Kim 2669da0d01 uncrypt: fix f2fs ioctl argument for pin_file
This patch fixes missing f2fs ioctl call.

Change-Id: Id840b76b9d5c580041aaee4501ac8e69fc3fb818
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
2018-08-01 03:52:51 +00:00
Tao Bao 0bc88de7aa ui: Read custom recovery UI values via system property.
The matching change to build system now writes these values as build
properties for recovery image. This allows us dropping the dependency on
Android.mk (as well as having more flexibility to do UI customization).

Also rename a few constant names, as the naming doesn't fully follow the
style guide (which reads "whose value is fixed for the duration of the
program").

Bug: 110380063
Test: Build and flash recovery image on taimen, which uses custom margin
      height. Check the UI and choose `Run graphics test`.
Change-Id: I2c50326123639cb36022f51b62cdeed925d77ba7
2018-07-31 15:14:40 -07:00
Jerry Zhang e540feb25e Merge "recovery: Add ability to interrupt UI" am: 561ee9362c am: 3528139409 am: 9e9ef363fb
am: e32cd9bc1a

Change-Id: I796540431ab767880929b2c3fd1dd08022f28ed3
2018-07-30 16:31:28 -07:00
Jerry Zhang e32cd9bc1a Merge "recovery: Add ability to interrupt UI" am: 561ee9362c am: 3528139409
am: 9e9ef363fb

Change-Id: I58f3c31c9afa274872167f3d72575a45bebf2ee4
2018-07-30 16:25:32 -07:00