summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Snap for 6001391 from a400d7e2e583b75da5f3db47e38138dbe13d58b7 to qt-aml-reso...android-mainline-10.0.0_r8android10-mainline-resolv-releaseandroid-build-team Robot2019-11-1123-160/+468
|\
| * Merge changes from topic "apex_manifest_pb" am: c1e6529305Jooyung Han2019-11-117-57/+92
| |\
| | * Merge changes from topic "apex_manifest_pb"Jooyung Han2019-11-117-57/+92
| | |\
| | | * Merge changes from topic "apex_manifest_pb"Jooyung Han2019-11-0813-84/+226
| | | |\
| | | | * Support binary pb format for manifest in apexd.Dario Freni2019-11-097-57/+92
| * | | | apexer: add apex_manifest.pb am: cd4d81e076Jooyung Han2019-11-116-27/+134
| |\| | |
| | * | | apexer: add apex_manifest.pbJooyung Han2019-11-116-27/+134
| | |\ \ \ | | | | |/ | | | |/|
| | | * | apexer: add apex_manifest.pbJooyung Han2019-11-086-27/+134
| * | | | Improve error message when public keys mismatch am: a78f8ef783Nikita Ioffe2019-11-111-18/+14
| |\| | |
| | * | | Improve error message when public keys mismatchNikita Ioffe2019-11-111-18/+14
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Improve error message when public keys mismatchNikita Ioffe2019-11-081-18/+14
| | | |/
| * | | Merge "Let new APEX win in case of samegrading one on /data" am: b1b081f2cbNikita Ioffe2019-11-112-2/+25
| |\| |
| | * | Merge "Let new APEX win in case of samegrading one on /data"Nikita Ioffe2019-11-112-2/+25
| | |\|
| | | * Merge "Let new APEX win in case of samegrading one on /data"Nikita Ioffe2019-11-072-2/+25
| | | |\
| | | | * Let new APEX win in case of samegrading one on /dataNikita Ioffe2019-11-072-2/+25
| * | | | resolve merge conflicts of 64662212f91c76527622a038a16980ce0e675e64 to stage-...Colin Cross2019-11-111-1/+12
| |\| | |
| | * | | resolve merge conflicts of 64662212f91c76527622a038a16980ce0e675e64 to stage-...Colin Cross2019-11-111-1/+12
| | |\| |
| | | * | Merge changes from topic "Apex_TEST_MAPPING"Treehugger Robot2019-11-071-1/+12
| | | |\ \ | | | | |/ | | | |/|
| | | | * Apex: Add conscrypt e2e test to presubmitAndreas Gampe2019-11-071-0/+3
| | | | * APEX: Add timezone e2e test to presubmitAndreas Gampe2019-11-071-0/+3
| | | | * Apex: Add rollback tests to presubmitAndreas Gampe2019-11-071-0/+3
| | | | * Import hostsidetests/stagedinstall TEST_MAPPING in apex/tests oneNikita Ioffe2019-11-071-2/+4
| * | | | Add apexd --unmount-all am: 0867c79c3cNikita Ioffe2019-11-073-0/+33
| |\| | |
| | * | | Add apexd --unmount-allNikita Ioffe2019-11-073-0/+33
| | |\| |
| | | * | Add apexd --unmount-allNikita Ioffe2019-11-073-0/+33
| * | | | Don't use MNT_DETACH when umounting APEXes am: 333d8fb688Nikita Ioffe2019-11-072-6/+7
| |\| | |
| | * | | Don't use MNT_DETACH when umounting APEXesNikita Ioffe2019-11-072-6/+7
| | |\| |
| | | * | Don't use MNT_DETACH when umounting APEXesNikita Ioffe2019-11-062-6/+7
| | | |/
| * | | End-to-end test for NNAPI APEX. am: 3d9e1191c7Przemyslaw Szczepaniak2019-11-043-0/+87
| |\| |
| | * | End-to-end test for NNAPI APEX.Przemyslaw Szczepaniak2019-11-043-0/+87
| | |\|
| | | * End-to-end test for NNAPI APEX.Przemyslaw Szczepaniak2019-11-013-0/+87
| * | | DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-m...Xin Li2019-10-300-0/+0
| |\| |
| | * | DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-m...Xin Li2019-10-300-0/+0
| | |\ \
| * | | | deapexer: add support for extracting content of APEX image am: 62ae36a143Nikita Ioffe2019-10-302-28/+50
| |\| | |
| | * | | deapexer: add support for extracting content of APEX imageNikita Ioffe2019-10-302-28/+50
| | |\ \ \ | | | | |/ | | | |/|
| | | * | deapexer: add support for extracting content of APEX imageNikita Ioffe2019-10-302-28/+50
| * | | | [automerger skipped] Merge Coral/Flame into AOSP master am: bd6aaa14f7 -s our...Xin Li2019-10-260-0/+0
| |\ \ \ \
| | * | | | [automerger skipped] Merge Coral/Flame into AOSP master am: bd6aaa14f7 -s oursXin Li2019-10-260-0/+0
| | |\| | |
| | | * | | [automerger skipped] Merge Coral/Flame into AOSP masterXin Li2019-10-260-0/+0
| | | |\| |
| | | | * | Merge Coral/Flame into AOSP masterXin Li2019-10-251-3/+0
| | | | |\ \
| * | | | | | Merge "apexd: log only to kernel logs" am: 0cf64be602 am: da6fef86e5Nikita Ioffe2019-10-251-15/+1
| |\| | | | |
| | * | | | | Merge "apexd: log only to kernel logs" am: 0cf64be602Nikita Ioffe2019-10-251-15/+1
| | |\| | | |
| | | * | | | Merge "apexd: log only to kernel logs"Nikita Ioffe2019-10-251-15/+1
| | | |\| | |
| | | | * | | Merge "apexd: log only to kernel logs"Nikita Ioffe2019-10-251-15/+1
| | | | |\ \ \
| | | | | * | | apexd: log only to kernel logsNikita Ioffe2019-10-251-15/+1
| * | | | | | | Revert "Revert "Make VNDK APEX as bootstrap APEX"" am: 7d97867aca am: 154cea775aJooyung Han2019-10-251-6/+13
|/| | | | | | | | |/ / / / / /
| * | | | | | Revert "Revert "Make VNDK APEX as bootstrap APEX"" am: 7d97867acaJooyung Han2019-10-251-6/+13
| |\| | | | |
| | * | | | | Revert "Revert "Make VNDK APEX as bootstrap APEX""Jooyung Han2019-10-251-6/+13
| | |\| | | | | | | |_|/ / | | |/| | |
| | | * | | Revert "Revert "Make VNDK APEX as bootstrap APEX""Jooyung Han2019-10-191-6/+13
| | | |/ /
* | | | | Merge "Skip QD1A.190821.011 in stage-aosp-master" into stage-aosp-master am: ...Xin Li2019-10-230-0/+0
|\| | | |