summaryrefslogtreecommitdiffstats
path: root/trusty
Commit message (Expand)AuthorAgeFilesLines
* bpfmt.Elliott Hughes2018-02-165-5/+14
* Use correct format specifierYi Kong2017-12-271-1/+1
* Add swillden and dkrahn to OWNERSShawn Willden2017-12-211-0/+2
* Merge "Add OWNERS."Elliott Hughes2017-12-071-0/+1
|\
| * Add OWNERS.Elliott Hughes2017-12-071-0/+1
* | Merge "add null pointer check for msg buffer"Yan, Shaopu2017-11-281-0/+5
|\|
| * add null pointer check for msg bufferYan, Shaopu2017-11-281-0/+5
* | Merge commit 'a63ccea6abc7ea02e2d98e41c80793ca97237bd3' fromXin Li2017-11-1416-377/+21
|\ \ | |/ |/|
| * resolve merge conflicts of 796987482 to stage-aosp-master am: bb5ec4a926Elliott Hughes2017-10-171-1/+0
| |\
| * \ Merge "Keymaster: Move test to std::unique_ptr" am: 81348ffa9e am: 346d7e1405Andreas Gampe2017-10-021-15/+15
| |\ \
| | * \ Merge "Keymaster: Move test to std::unique_ptr"Andreas Gampe2017-10-021-15/+15
| | |\ \
| * | | | Merge "Add missing include for readv." am: 1f6a807bac am: 831140358dChristopher Ferris2017-08-261-0/+1
| |\| | |
| | * | | Merge "Add missing include for readv."Christopher Ferris2017-08-261-0/+1
| | |\ \ \
| * | \ \ \ Merge "Move trusty reference implementations to /vendor" into oc-mr1-devHung-ying Tyan2017-08-229-4/+21
| |\ \ \ \ \
| | * | | | | Move trusty reference implementations to /vendorHung-ying Tyan2017-08-219-4/+21
| * | | | | | Merge "Pass in message_version_ received from the secure side." am: 1a955faab...Jocelyn Bohr2017-08-151-18/+18
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge "Pass in message_version_ received from the secure side." am: 1a955faab...Jocelyn Bohr2017-08-151-18/+18
| | |\ \ \ \ \
| * | \ \ \ \ \ Merge "Remove nvram trusty implementation." into oc-mr1-devHung-ying Tyan2017-08-157-371/+0
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | / / / / | | | |/ / / / | | |/| | | |
| | * | | | | Remove nvram trusty implementation.Hung-ying Tyan2017-08-157-371/+0
| | * | | | | Revert "Move trusty reference implementations to /vendor"Hung-ying Tyan2017-08-114-5/+0
| | * | | | | Move trusty reference implementations to /vendorHung-ying Tyan2017-08-094-0/+5
| * | | | | | Merge "Enable non-secure side to receive messages > 4K" am: 28fa8b0924 am: 92...Jocelyn Bohr2017-08-113-26/+43
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge "Return correct error code when finish input length is too long." am: 9...Jocelyn Bohr2017-08-031-1/+3
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge "Stop asking for old versions of C++ in system/core." am: e61e2fcf21 am...Elliott Hughes2017-08-021-1/+0
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Merge "system/core: use proper nativehelper headers" am: 4f59afe9fa am: 6208c...Steven Moreland2017-07-191-1/+1
| |\ \ \ \ \ \ \ \
| * | | | | | | | | trusty*: Android.mk -> Android.bpSteven Moreland2017-05-087-158/+178
| * | | | | | | | | Merge "trusty/storage/* to Android.bp" am: 1dcd257a21 am: 1561e34bf4 am: 9b76...Steven Moreland2017-05-0410-133/+130
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Rename libkeymaster to libkeymaster_stagingJanis Danisevskis2017-05-041-1/+1
| * | | | | | | | | | libkeymaster1 splitJanis Danisevskis2017-05-031-1/+2
| * | | | | | | | | | Revert "libkeymaster1 split"Janis Danisevskis2017-05-021-2/+1
| * | | | | | | | | | libkeymaster1 splitJanis Danisevskis2017-05-011-1/+2
* | | | | | | | | | | Use -Werror in system/coreChih-Hung Hsieh2017-11-014-1/+3
* | | | | | | | | | | Merge "Add missing includes."Treehugger Robot2017-10-231-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | Add missing includes.Dan Albert2017-10-171-0/+1
* | | | | | | | | | | Merge "<stdbool.h> not necessary in C++."Treehugger Robot2017-10-171-1/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | <stdbool.h> not necessary in C++.Elliott Hughes2017-10-171-1/+0
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | libkeymaster1 splitJanis Danisevskis2017-10-131-1/+2
* | | | | | | | | | Add missing includes.Dan Albert2017-10-111-0/+2
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | Keymaster: Move test to std::unique_ptrAndreas Gampe2017-10-021-15/+15
|/ / / / / / / /
* | | | | | | / Add missing include for readv.Christopher Ferris2017-08-251-0/+1
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge "Pass in message_version_ received from the secure side."Treehugger Robot2017-08-151-18/+18
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Pass in message_version_ received from the secure side.Jocelyn Bohr2017-08-111-18/+18
| | |_|_|_|/ | |/| | | |
* | | | | | Merge "Enable non-secure side to receive messages > 4K"Treehugger Robot2017-08-113-26/+43
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Enable non-secure side to receive messages > 4KJocelyn Bohr2017-08-103-26/+43
| | |_|/ / | |/| | |
* | | | | Merge "Return correct error code when finish input length is too long."Treehugger Robot2017-08-031-1/+3
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Return correct error code when finish input length is too long.Jocelyn Bohr2017-08-031-1/+3
| |/ / /
* / / / Stop asking for old versions of C++ in system/core.Elliott Hughes2017-08-021-1/+0
|/ / /
* | | system/core: use proper nativehelper headersSteven Moreland2017-07-181-1/+1
* | | trusty*: Android.mk -> Android.bpSteven Moreland2017-05-087-157/+177
| |/ |/|
* | trusty/storage/* to Android.bpSteven Moreland2017-05-0410-133/+130
|/