summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* keymaster: Reverse wait for qsee flagstaging/lineage-17.0_merge-android-10.0.0_r9lineage-17.1dianlujitao2019-12-112-5/+5
* keymaster: Build with BOARD_VNDK_VERSIONCraig Tatlor2019-12-111-1/+2
* keymaster: move to /vendorArtem Borisov2019-12-111-0/+2
* keymaster: Fix compiler warningsMichael Bestas2019-12-111-2/+1
* keymaster: add TARGET_PROVIDES_KEYMASTERKeith Mok2019-12-111-0/+2
* keymaster: Featureize support for waiting on QSEE to startmyfluxi2019-12-112-0/+9
* Keymaster: Check if keymaster TZ app is loadedJyoti Wadhwani2019-12-112-1/+28
* keymaster: Set HEAP_MASK_COMPATIBILITY by platform for QCOM_HARDWAREEthan Chen2019-12-111-0/+6
* Keymaster: Support for 64bit userspace and 32bit TZJyoti Wadhwani2019-12-113-19/+26
* keymaster: Use generated kernel headersBruno Martins2019-12-111-1/+1
* Revert "Remove legacy keymaster support for msm8226"Chirayu Desai2019-12-111-1/+1
* Revert "msm8974: remove from top level makefile"Chirayu Desai2019-12-111-1/+1
* [automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li2019-02-240-0/+0
|\
| * DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li2019-02-200-0/+0
| |\
* | \ [automerger skipped] Merge "DO NOT MERGE" am: 437b089a6d -s ours am: 88344dc...Xin Li2018-12-100-0/+0
|\ \ \ | | |/ | |/|
| * | [automerger skipped] Merge "DO NOT MERGE" am: 437b089a6d -s oursXin Li2018-12-100-0/+0
|/| | | |/
| * [automerger skipped] Merge "DO NOT MERGE"Xin Li2018-12-100-0/+0
|/|
| * Merge "DO NOT MERGE"Treehugger Robot2018-12-100-0/+0
|/|
| * DO NOT MERGEXin Li2018-12-070-0/+0
|/|
| * Snap for 4531101 from 2c1559041d5d30bf4e1d622b2c6924facf2a4daf to pi-releaseandroid-build-team Robot2018-01-071-0/+1
| |\ | |/ |/|
* | Merge "Add -Wno-error to compile with global -Werror." am: 7516becc84 am: c95...Chih-Hung Hsieh2018-01-051-0/+1
|\ \
| * \ Merge "Add -Wno-error to compile with global -Werror." am: 7516becc84Chih-Hung Hsieh2018-01-051-0/+1
| |\ \
| | * | Merge "Add -Wno-error to compile with global -Werror."Chih-Hung Hsieh2018-01-051-0/+1
| |/| |
| | * | Merge "Add -Wno-error to compile with global -Werror."Treehugger Robot2018-01-051-0/+1
| |/| |
| | * | Add -Wno-error to compile with global -Werror.Chih-Hung Hsieh2018-01-041-0/+1
| |/ /
| | * Snap for 4373608 from 67af5301c1c47a84e405713652a2dc5f5a59ecd6 to pi-releaseandroid-build-team Robot2017-10-031-9/+9
| | |\ | |_|/ |/| |
* | | Merge "Keymaster: Move test to std::unique_ptr" am: 4428c1f0c0 am: 1594c64b69...Andreas Gampe2017-10-021-9/+9
|\| |
| * | Merge "Keymaster: Move test to std::unique_ptr" am: 4428c1f0c0 am: 1594c64b69Andreas Gampe2017-10-021-9/+9
| |\ \
| | * \ Merge "Keymaster: Move test to std::unique_ptr" am: 4428c1f0c0Andreas Gampe2017-10-021-9/+9
| | |\ \
| | | * \ Merge "Keymaster: Move test to std::unique_ptr"Andreas Gampe2017-10-021-9/+9
| | | |\ \
| | | | * \ Merge "Keymaster: Move test to std::unique_ptr"Treehugger Robot2017-10-021-9/+9
| | | | |\ \
| | | | | * | Keymaster: Move test to std::unique_ptrAndreas Gampe2017-10-021-9/+9
| | | | |/ /
| | | | | * release-request-b4448e78-a682-4bc1-b691-b70e74fef19f-for-git_pi-release-43144...android-build-team Robot2017-09-031-2/+2
| | | | | |\ | |_|_|_|_|/ |/| | | | |
* | | | | | Merge "Fix a mismatched malloc/delete" am: 619ac6c26b am: 05033f69eb am: 8616...George Burgess IV2017-09-011-2/+2
|\| | | | | | |_|_|_|/ |/| | | |
| * | | | Merge "Fix a mismatched malloc/delete" am: 619ac6c26b am: 05033f69ebGeorge Burgess IV2017-09-011-2/+2
|/| | | | | |/ / /
| * | | Merge "Fix a mismatched malloc/delete" am: 619ac6c26bGeorge Burgess IV2017-09-011-2/+2
| |\| |
| | * | Merge "Fix a mismatched malloc/delete"George Burgess IV2017-09-011-2/+2
| |/| | | | |/
| | * Merge "Fix a mismatched malloc/delete"Treehugger Robot2017-09-011-2/+2
| | |\
| | | * Fix a mismatched malloc/deleteGeorge Burgess IV2017-08-311-2/+2
| | |/
* | | Merge "hardware/qcom/keymaster: use proper nativehelper headers" am: 3587a1a8...Steven Moreland2017-07-191-1/+1
|\| |
| * | Merge "hardware/qcom/keymaster: use proper nativehelper headers" am: 3587a1a8...Steven Moreland2017-07-191-1/+1
|/| |
| * | Merge "hardware/qcom/keymaster: use proper nativehelper headers" am: 3587a1a811Steven Moreland2017-07-191-1/+1
| |\|
| | * Merge "hardware/qcom/keymaster: use proper nativehelper headers"Steven Moreland2017-07-191-1/+1
| |/|
| | * Merge "hardware/qcom/keymaster: use proper nativehelper headers"Treehugger Robot2017-07-191-1/+1
| | |\
| | | * hardware/qcom/keymaster: use proper nativehelper headersSteven Moreland2017-07-181-1/+1
| | |/
* | | Separate auto build from rest of qcom am: 47284e8ce5Steve Paik2017-04-291-0/+3
|\| |
| * | Separate auto build from rest of qcomSteve Paik2017-04-291-0/+3
|/| |
| * | Separate auto build from rest of qcomSteve Paik2017-04-281-0/+3
|/ /
* | Merge "msm8974: remove from top level makefile am: 583ecf5ed2 am: 4e3df672cb"...Patrick Tjin2016-05-060-0/+0
|\|
| * Merge "msm8974: remove from top level makefile am: 583ecf5ed2 am: 4e3df672cb"...Android Build Merger (Role)2016-05-060-0/+0
| |\
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 02:59:40 +0000