PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,234 Commits 1 Branch 0 Tags
78df66969b88b5860ba1398ccd709ea12bdf42ce
Commit Graph
8234 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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 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 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 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 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 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
David Anderson 643ddd99df boot_control: Don't allow current_slot_ to be -1. 
If the HAL is run on a non-A/B device, it does not fail gracefully; it
will segfault because the current_slot is -1 and methods do not protect
against this. Instead, have Init() fail if we can't determine the
current slot.

Bug: 130078382
Test: vts tests
Change-Id: I2d3094518a842b1a764427d2da9d46781a9f26da
 2019-09-04 18:12:23 -07:00
Xin Li 007ac2d5fb DO NOT MERGE - Merge Android 10 into master 
Bug: 139893257
Change-Id: Id844b347e95335800502d9b5aeb15e18aabd29e1
 2019-09-04 13:32:49 -07:00
David Andersonandandroid-build-merger b9e7f63370 Merge "Make libboot_control vendor available." am: e3a35dc808 am: 388d2a591c 
am: bda485070c

Change-Id: I84a07437b4976ac1c63421257355debb36ef067f
 2019-09-03 13:14:21 -07:00
David Andersonandandroid-build-merger ef2ec5f840 Merge "Refactor boot_control into a separate library." am: eb35817830 am: 754e7fc190 
am: 6bf93864ce

Change-Id: I457a7ca44f1c1f1cccbebff693ab5adb7c022768
 2019-09-03 13:13:33 -07:00
David Andersonandandroid-build-merger bda485070c Merge "Make libboot_control vendor available." am: e3a35dc808 
am: 388d2a591c

Change-Id: I9ee92e1609ea285c1ae63f7b427fd62c24aa6127
 2019-09-03 13:07:06 -07:00
David Andersonandandroid-build-merger 6bf93864ce Merge "Refactor boot_control into a separate library." am: eb35817830 
am: 754e7fc190

Change-Id: I9e8d4489984de6cf0dcc96fcec8b81722966797d
 2019-09-03 13:06:29 -07:00
David Andersonandandroid-build-merger 388d2a591c Merge "Make libboot_control vendor available." 
am: e3a35dc808

Change-Id: Ia5661bdf289cbff91faf629f6b746920b0299a8e
 2019-09-03 13:00:16 -07:00
David Andersonandandroid-build-merger 754e7fc190 Merge "Refactor boot_control into a separate library." 
am: eb35817830

Change-Id: I330e599f7a8bf2aed111186ec54886b4c21b071a
 2019-09-03 12:59:35 -07:00
David AndersonandGerrit Code Review e3a35dc808 Merge "Make libboot_control vendor available." 2019-09-03 19:36:59 +00:00
David AndersonandGerrit Code Review eb35817830 Merge "Refactor boot_control into a separate library." 2019-09-03 19:33:22 +00:00
David Anderson f771484f4e Make libboot_control vendor available. 
Bug: 138861550
Test: builds
Change-Id: Ib745b59931c6258073e47b00def84c9157df90a7
 2019-08-30 10:21:00 -07:00
David Anderson 8108e2513f Refactor boot_control into a separate library. 
This extracts the implementation of boot_control into a new library,
libboot_control. The bootctrl.default module now wraps this library.
This refactoring will allow us to re-use the same implementation in
HIDL.

Bug: 138861550
Test: mm bootctrl.default
Change-Id: Ic0558da3c2d8e6f5ebec63a497825c24b51623b7
 2019-08-30 10:20:59 -07:00
Xin Liandandroid-build-merger 8fb95b5ae3 [automerger skipped] DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master am: bc7898323c -s ours 
am: b3aeafddca

Change-Id: Id759775f6eb82eb580f30c0fba9de8ad07e095a0
 2019-08-24 01:33:50 -07:00
Xin Liandandroid-build-merger b3aeafddca [automerger skipped] DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master 
am: bc7898323c -s ours
am skip reason: subject contains skip directive

Change-Id: Ibce509308710e29ac01e64d5a3194460d69eabc1
 2019-08-23 21:39:14 -07:00
Xin Liandandroid-build-merger 584da181c5 [automerger skipped] DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history am: 5ac14106ff -s ours 
am: 6e3d8bed97

Change-Id: I59a5ac4213c90a360aa8621513df0d8711b4eb93
 2019-08-23 21:17:12 -07:00
Xin Liandandroid-build-merger 6e3d8bed97 [automerger skipped] DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history 
am: 5ac14106ff -s ours
am skip reason: subject contains skip directive

Change-Id: I2f78ea8d7588dafe0bee2a4cab198f4b02395b15
 2019-08-23 20:25:20 -07:00
Xin Li bc7898323c DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master 
Bug: 139893257
Change-Id: Ibe6f21e2e0fd3a6626674595e4950d6adaff40fb
 2019-08-23 06:44:50 +00:00
Xin Li 5ac14106ff DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history 
Bug: 139893257
Change-Id: I3192a663f542955f012bcdcc42774624cc9e1891
 2019-08-23 06:42:00 +00:00
Yifan Hongandandroid-build-merger 8f2745c31d Merge "updater: Fix build for new CreateLogicalPartition signature." am: 18c3f78779 am: 41fd3c3ad9 
am: 0df5805d21

Change-Id: Ib90ad40cbe99ebe0154ea439e0560d8e5bd109b8
 2019-08-16 11:45:13 -07:00
Yifan Hongandandroid-build-merger 0df5805d21 Merge "updater: Fix build for new CreateLogicalPartition signature." am: 18c3f78779 
am: 41fd3c3ad9

Change-Id: Iea08b41ba9c710f7394e8e0bf5ac34cd9dd50490
 2019-08-16 11:34:48 -07:00
Yifan Hongandandroid-build-merger 41fd3c3ad9 Merge "updater: Fix build for new CreateLogicalPartition signature." 
am: 18c3f78779

Change-Id: Id0deb6160cf5b1bd04c99081a766df412a26e7f5
 2019-08-16 11:24:53 -07:00