Commit Graph

  • 71c35b9fba applypatch: Use static libs for libbrotli and libbz. Tao Bao 2019-09-23 08:58:44 -07:00
  • db83e0ff10 Merge "recovery: Don't report unrecognized option in recovery_main." am: 785d0b4efa am: e9788bc361 am: 7b72231ffa am: a5898a4e85 Tao Bao 2019-09-19 13:47:39 -07:00
  • a5898a4e85 Merge "recovery: Don't report unrecognized option in recovery_main." am: 785d0b4efa am: e9788bc361 am: 7b72231ffa Tao Bao 2019-09-19 13:38:32 -07:00
  • 7b72231ffa Merge "recovery: Don't report unrecognized option in recovery_main." am: 785d0b4efa am: e9788bc361 Tao Bao 2019-09-19 13:31:59 -07:00
  • e9788bc361 Merge "recovery: Don't report unrecognized option in recovery_main." am: 785d0b4efa Tao Bao 2019-09-19 13:25:31 -07:00
  • 785d0b4efa Merge "recovery: Don't report unrecognized option in recovery_main." Treehugger Robot 2019-09-19 20:07:04 +00:00
  • 0f40992f50 Merge "tests: recovery_unit_test requires root." am: 15a381e52c am: 687bb18724 am: 3fd5d407a4 am: fa433f7956 Tao Bao 2019-09-19 11:22:44 -07:00
  • fa433f7956 Merge "tests: recovery_unit_test requires root." am: 15a381e52c am: 687bb18724 am: 3fd5d407a4 Tao Bao 2019-09-19 11:16:45 -07:00
  • 3fd5d407a4 Merge "tests: recovery_unit_test requires root." am: 15a381e52c am: 687bb18724 Tao Bao 2019-09-19 11:10:27 -07:00
  • 687bb18724 Merge "tests: recovery_unit_test requires root." am: 15a381e52c Tao Bao 2019-09-19 11:03:22 -07:00
  • 15a381e52c Merge "tests: recovery_unit_test requires root." Tao Bao 2019-09-19 17:43:54 +00:00
  • dfb053e815 tests: recovery_unit_test requires root. Tao Bao 2019-09-19 08:08:54 -07:00
  • e3ad5346da Persistent logs: Compress target log on storage. bigbiff bigbiff 2019-09-18 19:05:59 -04:00
  • ff185865fd recovery: Don't report unrecognized option in recovery_main. Tao Bao 2019-09-18 13:28:32 -07:00
  • fc0939e574 Merge "Update the instruction for building recovery image on Pixels." am: 2d6e8f2ea8 am: 41c46448a6 am: 78df66969b am: 04783ac8e4 Tao Bao 2019-09-13 10:58:37 -07:00
  • 04783ac8e4 Merge "Update the instruction for building recovery image on Pixels." am: 2d6e8f2ea8 am: 41c46448a6 am: 78df66969b Tao Bao 2019-09-13 10:53:58 -07:00
  • da6df93ea0 Merge "Link libcrypto dynamically for recovery unit tests." am: 54100d3348 am: 97fee1c3b2 am: 5ece6250f0 am: b02a39b9e1 Tobias Thierer 2019-09-13 10:52:40 -07:00
  • 87f1e97128 Merge "Set LOCAL_INJECT_BSSL_HASH for updater" am: 0af65d8c4a am: a706ceec37 am: 9254aea083 am: 0d925b043a Tobias Thierer 2019-09-13 10:52:35 -07:00
  • b02a39b9e1 Merge "Link libcrypto dynamically for recovery unit tests." am: 54100d3348 am: 97fee1c3b2 am: 5ece6250f0 Tobias Thierer 2019-09-13 10:45:45 -07:00
  • 0d925b043a Merge "Set LOCAL_INJECT_BSSL_HASH for updater" am: 0af65d8c4a am: a706ceec37 am: 9254aea083 Tobias Thierer 2019-09-13 10:45:40 -07:00
  • 78df66969b Merge "Update the instruction for building recovery image on Pixels." am: 2d6e8f2ea8 am: 41c46448a6 Tao Bao 2019-09-13 10:40:32 -07:00
  • 5ece6250f0 Merge "Link libcrypto dynamically for recovery unit tests." am: 54100d3348 am: 97fee1c3b2 Tobias Thierer 2019-09-13 10:32:42 -07:00
  • 9254aea083 Merge "Set LOCAL_INJECT_BSSL_HASH for updater" am: 0af65d8c4a am: a706ceec37 Tobias Thierer 2019-09-13 10:32:38 -07:00
  • 41c46448a6 Merge "Update the instruction for building recovery image on Pixels." am: 2d6e8f2ea8 Tao Bao 2019-09-13 10:22:40 -07:00
  • 97fee1c3b2 Merge "Link libcrypto dynamically for recovery unit tests." am: 54100d3348 Tobias Thierer 2019-09-13 10:18:28 -07:00
  • a706ceec37 Merge "Set LOCAL_INJECT_BSSL_HASH for updater" am: 0af65d8c4a Tobias Thierer 2019-09-13 10:18:23 -07:00
  • 2d6e8f2ea8 Merge "Update the instruction for building recovery image on Pixels." Tao Bao 2019-09-13 17:08:37 +00:00
  • 54100d3348 Merge "Link libcrypto dynamically for recovery unit tests." Tobias Thierer 2019-09-13 16:56:06 +00:00
  • 0af65d8c4a Merge "Set LOCAL_INJECT_BSSL_HASH for updater" Tobias Thierer 2019-09-13 16:56:06 +00:00
  • 189d424ced Link libcrypto dynamically for recovery unit tests. Pete Bentley 2019-09-12 19:53:46 +01:00
  • 95656827dd Update the instruction for building recovery image on Pixels. Tao Bao 2019-09-12 13:03:06 -07:00
  • 02012cc3e1 Merge "Improve error messaging when bootcontrol HAL fails to load." am: 4878f6a31c am: 1074b8a539 am: c0e2ac8e5d am: 1f1f3b0a59 David Anderson 2019-09-09 18:06:04 -07:00
  • 1f1f3b0a59 Merge "Improve error messaging when bootcontrol HAL fails to load." am: 4878f6a31c am: 1074b8a539 am: c0e2ac8e5d David Anderson 2019-09-09 17:50:39 -07:00
  • c0e2ac8e5d Merge "Improve error messaging when bootcontrol HAL fails to load." am: 4878f6a31c am: 1074b8a539 David Anderson 2019-09-09 17:38:14 -07:00
  • 1074b8a539 Merge "Improve error messaging when bootcontrol HAL fails to load." am: 4878f6a31c David Anderson 2019-09-09 17:27:11 -07:00
  • 4878f6a31c Merge "Improve error messaging when bootcontrol HAL fails to load." David Anderson 2019-09-10 00:09:07 +00:00
  • 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 Xin Li 2019-09-08 16:06:29 -07:00
  • 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 Xin Li 2019-09-08 15:49:05 -07:00
  • 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 Xin Li 2019-09-08 15:06:31 -07:00
  • b3b43be5d8 Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master Xin Li 2019-09-08 12:42:27 -07:00
  • 91108d4124 Merge "Remove reference to libhwbinder_noltopgo." am: a44f947b6d am: 02ea8f4969 am: c5c995c095 am: 4ff84cdad3 Steven Moreland 2019-09-06 14:45:17 -07:00
  • 4ff84cdad3 Merge "Remove reference to libhwbinder_noltopgo." am: a44f947b6d am: 02ea8f4969 am: c5c995c095 Steven Moreland 2019-09-06 14:27:35 -07:00
  • c5c995c095 Merge "Remove reference to libhwbinder_noltopgo." am: a44f947b6d am: 02ea8f4969 Steven Moreland 2019-09-06 14:17:29 -07:00
  • 02ea8f4969 Merge "Remove reference to libhwbinder_noltopgo." am: a44f947b6d Steven Moreland 2019-09-06 11:13:36 -07:00
  • a44f947b6d Merge "Remove reference to libhwbinder_noltopgo." Steven Moreland 2019-09-06 17:59:21 +00:00
  • 174ad50af9 Merge "boot_control: Don't allow current_slot_ to be -1." am: 9c0f102828 am: 0c34ef807b am: 185013413e am: 569f587afd am: 093a8cb364 David Anderson 2019-09-05 17:16:47 -07:00
  • 093a8cb364 Merge "boot_control: Don't allow current_slot_ to be -1." am: 9c0f102828 am: 0c34ef807b am: 185013413e am: 569f587afd David Anderson 2019-09-05 17:10:09 -07:00
  • 569f587afd Merge "boot_control: Don't allow current_slot_ to be -1." am: 9c0f102828 am: 0c34ef807b am: 185013413e David Anderson 2019-09-05 16:59:02 -07:00
  • 185013413e Merge "boot_control: Don't allow current_slot_ to be -1." am: 9c0f102828 am: 0c34ef807b David Anderson 2019-09-05 16:51:48 -07:00
  • 0c34ef807b Merge "boot_control: Don't allow current_slot_ to be -1." am: 9c0f102828 David Anderson 2019-09-05 16:41:07 -07:00
  • d81519400c Set LOCAL_INJECT_BSSL_HASH for updater Colin Cross 2019-09-05 15:34:50 -07:00
  • e4f1a781f5 Remove reference to libhwbinder_noltopgo. Steven Moreland 2019-09-05 14:29:23 -07:00
  • 9c0f102828 Merge "boot_control: Don't allow current_slot_ to be -1." David Anderson 2019-09-05 20:21:47 +00:00
  • 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 Xin Li 2019-09-05 12:11:38 -07:00
  • b98955fe3f [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: e0364db712 -s ours am: 8bb31dbab7 am: 42c411dbbc Xin Li 2019-09-05 11:54:04 -07:00
  • 42c411dbbc [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: e0364db712 -s ours am: 8bb31dbab7 Xin Li 2019-09-05 11:32:10 -07:00
  • 8bb31dbab7 [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: e0364db712 -s ours am skip reason: subject contains skip directive Xin Li 2019-09-05 11:20:06 -07:00
  • e0364db712 Merge "DO NOT MERGE - Merge Android 10 into master" Xin Li 2019-09-05 16:53:28 +00:00
  • 46f38e4610 Add IBootControl 1.1 support to libboot_control. David Anderson 2019-08-29 15:09:22 -07:00
  • b18f153b12 Improve error messaging when bootcontrol HAL fails to load. David Anderson 2019-09-04 18:10:16 -07:00
  • 643ddd99df boot_control: Don't allow current_slot_ to be -1. David Anderson 2019-08-30 12:35:02 -07:00
  • 007ac2d5fb DO NOT MERGE - Merge Android 10 into master Xin Li 2019-09-04 13:32:49 -07:00
  • 047e30d9a4 Merge "Make libboot_control vendor available." am: e3a35dc808 am: 388d2a591c am: bda485070c am: b9e7f63370 am: cf0a630371 David Anderson 2019-09-03 13:28:22 -07:00
  • 0019bdf79c Merge "Refactor boot_control into a separate library." am: eb35817830 am: 754e7fc190 am: 6bf93864ce am: ef2ec5f840 am: 7e7a01662a David Anderson 2019-09-03 13:27:45 -07:00
  • cf0a630371 Merge "Make libboot_control vendor available." am: e3a35dc808 am: 388d2a591c am: bda485070c am: b9e7f63370 David Anderson 2019-09-03 13:23:24 -07:00
  • 7e7a01662a Merge "Refactor boot_control into a separate library." am: eb35817830 am: 754e7fc190 am: 6bf93864ce am: ef2ec5f840 David Anderson 2019-09-03 13:22:45 -07:00
  • b9e7f63370 Merge "Make libboot_control vendor available." am: e3a35dc808 am: 388d2a591c am: bda485070c David Anderson 2019-09-03 13:14:21 -07:00
  • ef2ec5f840 Merge "Refactor boot_control into a separate library." am: eb35817830 am: 754e7fc190 am: 6bf93864ce David Anderson 2019-09-03 13:13:33 -07:00
  • bda485070c Merge "Make libboot_control vendor available." am: e3a35dc808 am: 388d2a591c David Anderson 2019-09-03 13:07:06 -07:00
  • 6bf93864ce Merge "Refactor boot_control into a separate library." am: eb35817830 am: 754e7fc190 David Anderson 2019-09-03 13:06:29 -07:00
  • 388d2a591c Merge "Make libboot_control vendor available." am: e3a35dc808 David Anderson 2019-09-03 13:00:16 -07:00
  • 754e7fc190 Merge "Refactor boot_control into a separate library." am: eb35817830 David Anderson 2019-09-03 12:59:35 -07:00
  • e3a35dc808 Merge "Make libboot_control vendor available." David Anderson 2019-09-03 19:36:59 +00:00
  • eb35817830 Merge "Refactor boot_control into a separate library." David Anderson 2019-09-03 19:33:22 +00:00
  • 0be03b3217 Encryption: try wrapped key if the first time decryption fails bigbiff bigbiff 2019-08-27 20:50:31 -04:00
  • 05cd3f8616 ext4crypt: change to upgrade key if export fails Peter Cai 2019-05-25 21:12:29 +08:00
  • 90edd2e867 ext4crypt: support wrappedkey for FBE Peter Cai 2019-05-23 16:32:22 +08:00
  • f771484f4e Make libboot_control vendor available. David Anderson 2019-08-29 13:47:45 -07:00
  • 8108e2513f Refactor boot_control into a separate library. David Anderson 2019-08-28 15:24:07 -07:00
  • 809177c32c [automerger skipped] DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master am: bc7898323c -s ours am: b3aeafddca am: 8fb95b5ae3 am: 483637a524 -s ours am skip reason: subject contains skip directive Xin Li 2019-08-26 13:23:14 -07:00
  • 5a379607ad [automerger skipped] DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history am: 5ac14106ff -s ours am: 6e3d8bed97 am: 584da181c5 am: 58c7edfedf -s ours am skip reason: subject contains skip directive Xin Li 2019-08-26 12:37:57 -07:00
  • 483637a524 [automerger skipped] DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master am: bc7898323c -s ours am: b3aeafddca am: 8fb95b5ae3 Xin Li 2019-08-26 12:20:15 -07:00
  • 58c7edfedf [automerger skipped] DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history am: 5ac14106ff -s ours am: 6e3d8bed97 am: 584da181c5 Xin Li 2019-08-26 11:26:32 -07:00
  • 8fb95b5ae3 [automerger skipped] DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master am: bc7898323c -s ours am: b3aeafddca Xin Li 2019-08-24 01:33:50 -07:00
  • 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 Xin Li 2019-08-23 21:39:14 -07:00
  • 584da181c5 [automerger skipped] DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history am: 5ac14106ff -s ours am: 6e3d8bed97 Xin Li 2019-08-23 21:17:12 -07:00
  • 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 Xin Li 2019-08-23 20:25:20 -07:00
  • bc7898323c DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master Xin Li 2019-08-23 06:44:50 +00:00
  • 5ac14106ff DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history Xin Li 2019-08-23 06:42:00 +00:00
  • dc178d9737 Merge "updater: Fix build for new CreateLogicalPartition signature." am: 18c3f78779 am: 41fd3c3ad9 am: 0df5805d21 am: 8f2745c31d am: fc7e2911e8 Yifan Hong 2019-08-16 12:03:27 -07:00
  • fc7e2911e8 Merge "updater: Fix build for new CreateLogicalPartition signature." am: 18c3f78779 am: 41fd3c3ad9 am: 0df5805d21 am: 8f2745c31d Yifan Hong 2019-08-16 11:54:23 -07:00
  • 8f2745c31d Merge "updater: Fix build for new CreateLogicalPartition signature." am: 18c3f78779 am: 41fd3c3ad9 am: 0df5805d21 Yifan Hong 2019-08-16 11:45:13 -07:00
  • 0df5805d21 Merge "updater: Fix build for new CreateLogicalPartition signature." am: 18c3f78779 am: 41fd3c3ad9 Yifan Hong 2019-08-16 11:34:48 -07:00
  • 41fd3c3ad9 Merge "updater: Fix build for new CreateLogicalPartition signature." am: 18c3f78779 Yifan Hong 2019-08-16 11:24:53 -07:00
  • 18c3f78779 Merge "updater: Fix build for new CreateLogicalPartition signature." Yifan Hong 2019-08-16 17:41:22 +00:00
  • 61fb1bbaf7 Merge "Remove common.h" am: 899f7b5105 am: 03fd851f61 am: 9387e5cd61 am: 9f1625a115 am: 6718707817 Tianjie Xu 2019-08-15 19:47:19 -07:00
  • 6718707817 Merge "Remove common.h" am: 899f7b5105 am: 03fd851f61 am: 9387e5cd61 am: 9f1625a115 Tianjie Xu 2019-08-15 19:24:56 -07:00
  • 9f1625a115 Merge "Remove common.h" am: 899f7b5105 am: 03fd851f61 am: 9387e5cd61 Tianjie Xu 2019-08-15 19:10:55 -07:00
  • 9387e5cd61 Merge "Remove common.h" am: 899f7b5105 am: 03fd851f61 Tianjie Xu 2019-08-15 18:59:51 -07:00
  • 03fd851f61 Merge "Remove common.h" am: 899f7b5105 Tianjie Xu 2019-08-15 18:05:25 -07:00