summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Snap for 7209783 from 2e378e76d03888651bbcaa597aac0894a0d654b5 to simpleperf-...simpleperf-releaseandroid-build-prod (mdb)2021-03-150-0/+0
|\
| * Mark ab/7061308 as merged in stage.HEADandroid-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1mastermain-cg-testing-releaseandroid-s-beta-5android-s-beta-4Xin Li2021-02-200-0/+0
| |\
| | * Merge "Add function to get active boot slot" am: 054c52c30a am: 518eb4a2adTianjie Xu2020-12-111-0/+30
| | |\
| * | \ [LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/bootctrl am: 484b46cfb7Bob Badour2021-02-191-0/+17
| |\ \ \ | | |_|/ | |/| |
| * | | Merge "Add function to get active boot slot" am: 054c52c30aTianjie Xu2020-12-111-0/+30
| |\ \ \ | | |_|/ | |/| |
* | | | Snap for 7168215 from 484b46cfb70ac8184028d9a559a404ab483aa8c2 to simpleperf-...android-build-prod (mdb)2021-02-241-0/+17
|\ \ \ \ | | |_|/ | |/| |
| * | | [LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/bootctrlBob Badour2021-02-121-0/+17
| | |/ | |/|
* | | Snap for 7116807 from 054c52c30a078f5a2d8883ef0cc7d3d303420f91 to simpleperf-...android-build-prod (mdb)2021-02-011-0/+30
|\| |
| * | Merge "Add function to get active boot slot"android-s-preview-1Tianjie Xu2020-12-111-0/+30
| |\ \ | | |/ | |/|
| | * Add function to get active boot slotTianjie2020-12-031-0/+30
| * | Add METADATA to bootctrl: BSD=NOTICE am: 0588ce4c51 am: 2151057a4c am: f4789e...Bob Badour2020-05-051-0/+3
| |\|
* | | Snap for 7002008 from 251f446cd40ef36dc803dc7ff2bf3c39f95638e9 to simpleperf-...android-build-prod (mdb)2020-11-300-0/+0
|\ \ \ | | |/ | |/|
| * | Add METADATA to bootctrl: BSD=NOTICE am: 0588ce4c51 am: 2151057a4c am: f4789e...Bob Badour2020-05-051-0/+3
| |\ \ | | |/ | |/|
* | | Snap for 6844436 from f4789eed642fafd89c0c1ab581fb47f532494572 to simpleperf-...android-build-prod (mdb)2020-09-170-0/+0
|\ \ \ | | |/ | |/|
| * | Add METADATA to bootctrl: BSD=NOTICE am: 0588ce4c51 am: 2151057a4cBob Badour2020-05-051-0/+3
| |\ \ | | |/ | |/|
| * | Merge "Remove Android.mk rules for building bootctrl. am: 7bde6868ff am: 3084...android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r4android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r33android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r2android-mainline-11.0.0_r19android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android-mainline-11.0.0_r10android-mainline-11.0.0_r1android-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android-11.0.0_r16android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-mainline-tethering-releaseandroid11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-devandroid11-d2-releaseandroid11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid11-d1-b-releaseTao Bao2019-05-310-0/+0
| |\ \
| * \ \ Remove Android.mk rules for building bootctrl. am: 7bde6868ff am: 308431ceb7 ...Tao Bao2019-05-311-30/+0
| |\ \ \
| * \ \ \ [automerger skipped] Build bootctrl.msm8996 with Android.bp. am: b229dfc102 a...Tao Bao2019-05-270-0/+0
| |\ \ \ \
| * \ \ \ \ Build bootctrl.msm8996 with Android.bp. am: e3818e1e44Tao Bao2019-05-241-5/+0
| |\ \ \ \ \
| * \ \ \ \ \ [automerger skipped] Revert^2 "Build bootctrl.msm8998 with Android.bp."" am: ...Tao Bao2019-05-240-0/+0
| |\ \ \ \ \ \
| * \ \ \ \ \ \ [automerger skipped] Revert^2 "Build bootctrl.msm8998 with Android.bp."" am: ...Tao Bao2019-05-230-0/+0
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ [automerger skipped] Build bootctrl.sdm710 with Android.bp. am: c665a9c43f am...Tao Bao2019-05-220-0/+0
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Revert^2 "Build bootctrl.msm8998 with Android.bp.""Tao Bao2019-05-211-1/+1
| * | | | | | | | | Build bootctrl.sdm710 with Android.bp. am: aa97ef614cTao Bao2019-05-211-1/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge "Revert "Build bootctrl.msm8998 with Android.bp.""Tao Bao2019-05-151-1/+1
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Revert "Build bootctrl.msm8998 with Android.bp."Tao Bao2019-05-151-1/+1
| * | | | | | | | | | | Merge "Build bootctrl.msm8998 with Android.bp."Tao Bao2019-05-151-1/+1
| |\| | | | | | | | | |
| | * | | | | | | | | | Build bootctrl.msm8998 with Android.bp.Tao Bao2019-05-091-1/+1
| * | | | | | | | | | | [automerger skipped] Build bootctrl.sdm845 using Android.bp am: c5847fc02a am...Hridya Valsaraju2019-05-090-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Snap for 6577974 from 2151057a4c74e8465b64c45ad5878f0b0ae62159 to simpleperf-...android-build-prod (mdb)2020-06-101-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | Add METADATA to bootctrl: BSD=NOTICE am: 0588ce4c51android-r-beta-3android-r-beta-2Bob Badour2020-05-051-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| | * | | | | | | | | | Add METADATA to bootctrl: BSD=NOTICEBob Badour2020-05-011-0/+3
| |/ / / / / / / / / /
* | | | | | | | | | | Snap for 5991463 from 4e5d4010484ae58b169f00d036efff78546a3def to simpleperf-...android-build-prod (mdb)2019-11-060-0/+0
|\| | | | | | | | | |
| * | | | | | | | | | Merge "Remove Android.mk rules for building bootctrl. am: 7bde6868ff am: 3084...android-r-preview-4android-r-preview-3android-r-preview-2android-r-preview-1android10-mainline-resolv-releaseandroid10-mainline-networking-releaseTao Bao2019-05-310-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | Remove Android.mk rules for building bootctrl. am: 7bde6868ff am: 308431ceb7Tao Bao2019-05-311-30/+0
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | [automerger skipped] Build bootctrl.msm8996 with Android.bp. am: b229dfc102 a...Tao Bao2019-05-270-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | Build bootctrl.msm8996 with Android.bp.Tao Bao2019-05-241-5/+0
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | [automerger skipped] Revert^2 "Build bootctrl.msm8998 with Android.bp."" am: ...Tao Bao2019-05-230-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | Revert^2 "Build bootctrl.msm8998 with Android.bp.""Tao Bao2019-05-231-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | [automerger skipped] Build bootctrl.sdm710 with Android.bp. am: c665a9c43f am...Tao Bao2019-05-220-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | Build bootctrl.sdm710 with Android.bp.Tao Bao2019-05-211-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Snap for 5933730 from 6bd5b61b992efa26f02a4682080fa79c88af0a8b to simpleperf-...android-build-prod (mdb)2019-10-110-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
| * | | | | | | | | | Merge "Remove Android.mk rules for building bootctrl. am: 7bde6868ff am: 3084...ndk-sysroot-r21Android Build Merger (Role)2019-05-310-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
| | * | | | | | | | | Remove Android.mk rules for building bootctrl. am: 7bde6868ffTao Bao2019-05-311-30/+0
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | |
| * | | | | | | | | | Remove Android.mk rules for building bootctrl. am: 7bde6868ffTao Bao2019-05-311-30/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| / / / / / / / / | | |/ / / / / / / /
| | * | | | | | | | Remove Android.mk rules for building bootctrl.Tao Bao2019-05-311-30/+0
| | |\ \ \ \ \ \ \ \
| * | | | | | | | | | [automerger skipped] Build bootctrl.msm8996 with Android.bp. am: b229dfc102Tao Bao2019-05-270-0/+0
| |\| | | | | | | | | | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| | * | | | | | | | Build bootctrl.msm8996 with Android.bp.Tao Bao2019-05-271-5/+0
| | |\ \ \ \ \ \ \ \
| * | | | | | | | | | Build bootctrl.msm8996 with Android.bp.Tao Bao2019-05-231-5/+0
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | [automerger skipped] Revert^2 "Build bootctrl.msm8998 with Android.bp."" am: ...Tao Bao2019-05-230-0/+0
| |\| | | | | | | | | | |_|_|_|_|_|/ / | |/| | | | | | |