PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,911 Commits 1 Branch 0 Tags
aed1bdfe59fddd8ee59ff6bbfbcdabf89df808ff
Commit Graph
10911 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tao BaoandGerrit Code Review 15a381e52c Merge "tests: recovery_unit_test requires root." 2019-09-19 17:43:54 +00:00
Tao Bao dfb053e815 tests: recovery_unit_test requires root. 
Bug: 141272654
Test: TreeHugger (recovery_unit_test no longer fails)
Change-Id: I47cbee274e659e3d90be5a77b215466d2973c7d6
 2019-09-19 08:08:54 -07:00
bigbiff bigbiff e3ad5346da Persistent logs: Compress target log on storage. 
This update will use pigz to compress the log that TWRP stores
on persistent storage in order to help with storing logs on the
persist partition.

Change-Id: I16971b8b138b74a164b1b0835847177cfc6104e2
 2019-09-18 19:17:20 -04:00
Tao Bao ff185865fd recovery: Don't report unrecognized option in recovery_main. 
recovery_main is only interested in a subset of options. Suppress the
warning for unrecognized options (which are likely intended for
recovery).

Fixes: 141239600
Test: On Pixel 3a, write `--security` flag into /misc and reboot
      recovery. Check that recovery_main no longer reports
      "unrecognized option" warning.
      # echo "recovery\n--security\n" | \
          dd of=/dev/block/by-name/misc conv=notrunc bs=1 seek=64
      # killall -9 recovery
      # cat /tmp/recovery.log
Test: Write `--show_text=foo` instead, and check that recovery reports
      "option `--show_text' doesn't allow an argument".
Change-Id: I1cb3a5ed6db91e41453b8aad00c8608f78ac1fa6
 2019-09-18 16:12:59 -07:00
Tao Baoandandroid-build-merger fc0939e574 Merge "Update the instruction for building recovery image on Pixels." am: 2d6e8f2ea8 am: 41c46448a6 am: 78df66969b 
am: 04783ac8e4

Change-Id: If049050b2b943467f7992b8628ae805d74f691cc
 2019-09-13 10:58:37 -07:00
Tao Baoandandroid-build-merger 04783ac8e4 Merge "Update the instruction for building recovery image on Pixels." am: 2d6e8f2ea8 am: 41c46448a6 
am: 78df66969b

Change-Id: I586524f8a2083e2957de030ede3a972fcaed9596
 2019-09-13 10:53:58 -07:00
Tobias Thiererandandroid-build-merger da6df93ea0 Merge "Link libcrypto dynamically for recovery unit tests." am: 54100d3348 am: 97fee1c3b2 am: 5ece6250f0 
am: b02a39b9e1

Change-Id: Idf27b73d83f1dc80cc7a8611dbcefc48d8b793e5
 2019-09-13 10:52:40 -07:00
Tobias Thiererandandroid-build-merger 87f1e97128 Merge "Set LOCAL_INJECT_BSSL_HASH for updater" am: 0af65d8c4a am: a706ceec37 am: 9254aea083 
am: 0d925b043a

Change-Id: I7d74d5c6130aed20d7ad6c023c6da56aefb1c664
 2019-09-13 10:52:35 -07:00
Tobias Thiererandandroid-build-merger b02a39b9e1 Merge "Link libcrypto dynamically for recovery unit tests." am: 54100d3348 am: 97fee1c3b2 
am: 5ece6250f0

Change-Id: I8a4bc0c7b1564188085cdeec54ea68b1489332d4
 2019-09-13 10:45:45 -07:00
Tobias Thiererandandroid-build-merger 0d925b043a Merge "Set LOCAL_INJECT_BSSL_HASH for updater" am: 0af65d8c4a am: a706ceec37 
am: 9254aea083

Change-Id: Ifa24107663254f3c08d2a261fef89a57ceae36a4
 2019-09-13 10:45:40 -07:00
Tao Baoandandroid-build-merger 78df66969b Merge "Update the instruction for building recovery image on Pixels." am: 2d6e8f2ea8 
am: 41c46448a6

Change-Id: If3325d5d689d1214627e71f882d248b8711edaee
 2019-09-13 10:40:32 -07:00
Tobias Thiererandandroid-build-merger 5ece6250f0 Merge "Link libcrypto dynamically for recovery unit tests." am: 54100d3348 
am: 97fee1c3b2

Change-Id: I1c839029b1e967234d1c181eb30b9638a42cd4e3
 2019-09-13 10:32:42 -07:00
Tobias Thiererandandroid-build-merger 9254aea083 Merge "Set LOCAL_INJECT_BSSL_HASH for updater" am: 0af65d8c4a 
am: a706ceec37

Change-Id: I7bb7132e2efff9bb0391a4c7f606ad0fe3232de5
 2019-09-13 10:32:38 -07:00
Tao Baoandandroid-build-merger 41c46448a6 Merge "Update the instruction for building recovery image on Pixels." 
am: 2d6e8f2ea8

Change-Id: I4f009637f8a75996a43a400a5ceaed193e0e54ab
 2019-09-13 10:22:40 -07:00
Tobias Thiererandandroid-build-merger 97fee1c3b2 Merge "Link libcrypto dynamically for recovery unit tests." 
am: 54100d3348

Change-Id: I804ef56f77f28ce9e2d74b2227e7c26a3b6c22f2
 2019-09-13 10:18:28 -07:00
Tobias Thiererandandroid-build-merger a706ceec37 Merge "Set LOCAL_INJECT_BSSL_HASH for updater" 
am: 0af65d8c4a

Change-Id: I6db7618d1aaea087fe52a17aa3212b1b13b40a89
 2019-09-13 10:18:23 -07:00
Tao BaoandGerrit Code Review 2d6e8f2ea8 Merge "Update the instruction for building recovery image on Pixels." 2019-09-13 17:08:37 +00:00
Tobias ThiererandGerrit Code Review 54100d3348 Merge "Link libcrypto dynamically for recovery unit tests." 2019-09-13 16:56:06 +00:00
Tobias ThiererandGerrit Code Review 0af65d8c4a Merge "Set LOCAL_INJECT_BSSL_HASH for updater" 2019-09-13 16:56:06 +00:00
Pete Bentley 189d424ced Link libcrypto dynamically for recovery unit tests. 
Tested by running recovery_unit_test as described in
https://android.googlesource.com/platform/bootable/recovery/+/refs/heads/master/README.md

Attempted to build and boot a recovery image with the
same change to confirm it still works, but
m recoveryimage-nodeps
fails for me.

Bug: 140940227
Test: See above
Change-Id: I00545968a0e5684823e505f2ddbe7e993319b5d4
 2019-09-13 12:18:44 +01:00
Tao Bao 95656827dd Update the instruction for building recovery image on Pixels. 
Test: N/A
Change-Id: I14d7bba5b214cc0bf43d6294cff1b7dcbea72ee8
 2019-09-12 13:10:44 -07:00
David Andersonandandroid-build-merger 02012cc3e1 Merge "Improve error messaging when bootcontrol HAL fails to load." am: 4878f6a31c am: 1074b8a539 am: c0e2ac8e5d 
am: 1f1f3b0a59

Change-Id: I242cb9479699ffe95a89f06f2075fd32a55ad7c6
 2019-09-09 18:06:04 -07:00
David Andersonandandroid-build-merger 1f1f3b0a59 Merge "Improve error messaging when bootcontrol HAL fails to load." am: 4878f6a31c am: 1074b8a539 
am: c0e2ac8e5d

Change-Id: Ic66b6370515a7aed2f26bdacf64859668d230e37
 2019-09-09 17:50:39 -07:00
David Andersonandandroid-build-merger c0e2ac8e5d Merge "Improve error messaging when bootcontrol HAL fails to load." am: 4878f6a31c 
am: 1074b8a539

Change-Id: I6438198585e750b796d4cbc5c0e05940cbd90e40
 2019-09-09 17:38:14 -07:00
David Andersonandandroid-build-merger 1074b8a539 Merge "Improve error messaging when bootcontrol HAL fails to load." 
am: 4878f6a31c

Change-Id: Ic9b5bacec378bd497d6d488b98dd1b224aa6e166
 2019-09-09 17:27:11 -07:00
David AndersonandGerrit Code Review 4878f6a31c Merge "Improve error messaging when bootcontrol HAL fails to load." 2019-09-10 00:09:07 +00:00
Xin Liandandroid-build-merger 96dfed884c [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: b3b43be5d8 -s ours am: 4b1e751181 -s ours 
am: 4ec16abf82 -s ours
am skip reason: change_id I8a2c42ff322242f08fd6601536c3f9ee50d0f633 with SHA1 02ea8f4969 is in history

Change-Id: I10f3a47376ab5129ec759278e40a344519f0f97a
 2019-09-08 16:06:29 -07:00
Xin Liandandroid-build-merger 4ec16abf82 [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: b3b43be5d8 -s ours 
am: 4b1e751181 -s ours
am skip reason: change_id I8a2c42ff322242f08fd6601536c3f9ee50d0f633 with SHA1 02ea8f4969 is in history

Change-Id: I272e0a384d779128d4b182e03b34abff5d345b7b
 2019-09-08 15:49:05 -07:00
Xin Liandandroid-build-merger 4b1e751181 [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master 
am: b3b43be5d8 -s ours
am skip reason: change_id I8a2c42ff322242f08fd6601536c3f9ee50d0f633 with SHA1 02ea8f4969 is in history

Change-Id: Ied04f35b7ebcb462c22f3fff019953844606415b
 2019-09-08 15:06:31 -07:00
Xin Li b3b43be5d8 Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master 
No content change.

Bug: 135460123
Change-Id: I70fc102e00f98edd34b59661c00a8abbe37a8f26
Merged-In: I8a2c42ff322242f08fd6601536c3f9ee50d0f633
 2019-09-08 12:42:27 -07:00
Steven Morelandandandroid-build-merger 91108d4124 Merge "Remove reference to libhwbinder_noltopgo." am: a44f947b6d am: 02ea8f4969 am: c5c995c095 
am: 4ff84cdad3

Change-Id: I0261b9f114682b64d30982356ee60f7b6ac7c531
 2019-09-06 14:45:17 -07:00
Steven Morelandandandroid-build-merger 4ff84cdad3 Merge "Remove reference to libhwbinder_noltopgo." am: a44f947b6d am: 02ea8f4969 
am: c5c995c095

Change-Id: I7afc3196f6057277e1a0b69546fac54f14939d06
 2019-09-06 14:27:35 -07:00
Steven Morelandandandroid-build-merger c5c995c095 Merge "Remove reference to libhwbinder_noltopgo." am: a44f947b6d 
am: 02ea8f4969

Change-Id: I3eaf679e008b2dfc2ad7134eb75db4e6550a05ca
 2019-09-06 14:17:29 -07:00
Steven Morelandandandroid-build-merger 02ea8f4969 Merge "Remove reference to libhwbinder_noltopgo." 
am: a44f947b6d

Change-Id: I8a2c42ff322242f08fd6601536c3f9ee50d0f633
 2019-09-06 11:13:36 -07:00
Steven MorelandandGerrit Code Review a44f947b6d Merge "Remove reference to libhwbinder_noltopgo." 2019-09-06 17:59:21 +00:00
David Andersonandandroid-build-merger 174ad50af9 Merge "boot_control: Don't allow current_slot_ to be -1." am: 9c0f102828 am: 0c34ef807b am: 185013413e am: 569f587afd 
am: 093a8cb364

Change-Id: Ib1106dbcbd3db8d763e6938264b486081e0d80c9
 2019-09-05 17:16:47 -07:00
David Andersonandandroid-build-merger 093a8cb364 Merge "boot_control: Don't allow current_slot_ to be -1." am: 9c0f102828 am: 0c34ef807b am: 185013413e 
am: 569f587afd

Change-Id: I9b10028dbcc474cee42bd080d25fdab598ef431c
 2019-09-05 17:10:09 -07:00
David Andersonandandroid-build-merger 569f587afd Merge "boot_control: Don't allow current_slot_ to be -1." am: 9c0f102828 am: 0c34ef807b 
am: 185013413e

Change-Id: I6a3c4bdaefca35eb23c362981bef43169cb9fcb0
 2019-09-05 16:59:02 -07:00
David Andersonandandroid-build-merger 185013413e Merge "boot_control: Don't allow current_slot_ to be -1." am: 9c0f102828 
am: 0c34ef807b

Change-Id: I96aeea2e63243d587fe3183f1388c9bc76ee5d86
 2019-09-05 16:51:48 -07:00
David Andersonandandroid-build-merger 0c34ef807b Merge "boot_control: Don't allow current_slot_ to be -1." 
am: 9c0f102828

Change-Id: I28a50628ecdaf2a6f0ccf0e1a93cf9f70fa47ad0
 2019-09-05 16:41:07 -07:00
Colin Cross d81519400c Set LOCAL_INJECT_BSSL_HASH for updater 
updater is built in Make and statically links libcrypto,
so it needs to set LOCAL_INJECT_BSSL_HASH to make the FIPS self
test pass.

Bug: 137267623
Test: m checkbuild
Change-Id: Ib253c870090ac8026f5cbb005d6b0e935c73edd1
 2019-09-05 15:34:50 -07:00
Steven Moreland e4f1a781f5 Remove reference to libhwbinder_noltopgo. 
No longer needed.

Bug: 135558503
Test: build only
Change-Id: Ia1257513c6276cdb01604fbedb411e7412d02b84
 2019-09-05 14:29:23 -07:00
David AndersonandGerrit Code Review 9c0f102828 Merge "boot_control: Don't allow current_slot_ to be -1." 2019-09-05 20:21:47 +00:00
Xin Liandandroid-build-merger e250484bc6 [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: e0364db712 -s ours am: 8bb31dbab7 am: 42c411dbbc 
am: b98955fe3f -s ours
am skip reason: subject contains skip directive

Change-Id: If8d70a0383c8c7c7e822a81c93ff83989f740c5b
 2019-09-05 12:11:38 -07:00
Xin Liandandroid-build-merger b98955fe3f [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: e0364db712 -s ours am: 8bb31dbab7 
am: 42c411dbbc

Change-Id: Ibe58c801b076692b3729ac7d8b2520916c4dbb5a
 2019-09-05 11:54:04 -07:00
Xin Liandandroid-build-merger 42c411dbbc [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: e0364db712 -s ours 
am: 8bb31dbab7

Change-Id: I5884c4dd3197ed2b62500eea0ef7ee864c4ab8da
 2019-09-05 11:32:10 -07:00
Xin Liandandroid-build-merger 8bb31dbab7 [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" 
am: e0364db712 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie38bb30aa5743600e5c563357a2d577e3e3710d9
 2019-09-05 11:20:06 -07:00
Xin LiandGerrit Code Review e0364db712 Merge "DO NOT MERGE - Merge Android 10 into master" 2019-09-05 16:53:28 +00:00
David Anderson 46f38e4610 Add IBootControl 1.1 support to libboot_control. 
Bug: 138861550
Test: vts
Change-Id: Id4a2963d6ab657d8ab076b7013492a691462b287
 2019-09-04 18:12:36 -07:00
David Anderson b18f153b12 Improve error messaging when bootcontrol HAL fails to load. 
Bug: N/A
Test: manual test
Change-Id: I6bf849dba4ae66353c44875ece30917283557327
 2019-09-04 18:12:35 -07:00