PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,372 Commits 1 Branch 0 Tags
da6df93ea048b95f0298d3fb712ddcbef12e3c74
Commit Graph
8372 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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 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 047e30d9a4 Merge "Make libboot_control vendor available." am: e3a35dc808 am: 388d2a591c am: bda485070c am: b9e7f63370 
am: cf0a630371

Change-Id: I2f40f3184a10be17d96c6c7f6253830da143c95e
 2019-09-03 13:28:22 -07:00
David Andersonandandroid-build-merger 0019bdf79c Merge "Refactor boot_control into a separate library." am: eb35817830 am: 754e7fc190 am: 6bf93864ce am: ef2ec5f840 
am: 7e7a01662a

Change-Id: I0fbdf1f21100e97fd686426ad46d6179273e3c08
 2019-09-03 13:27:45 -07:00
David Andersonandandroid-build-merger cf0a630371 Merge "Make libboot_control vendor available." am: e3a35dc808 am: 388d2a591c am: bda485070c 
am: b9e7f63370

Change-Id: Ia70a4b63248d803c2154044f670539e4023ec3ae
 2019-09-03 13:23:24 -07:00
David Andersonandandroid-build-merger 7e7a01662a Merge "Refactor boot_control into a separate library." am: eb35817830 am: 754e7fc190 am: 6bf93864ce 
am: ef2ec5f840

Change-Id: I32efd5cf67f2cc4fc3d09f1de061630135c119d0
 2019-09-03 13:22:45 -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