summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospandroid-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseXin Li
am: 5344bb3347 Change-Id: Ib86af3dbaf18f91accb7a52153c7a323fb629bbc
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
Bug: 126125118 Change-Id: Ibe1e43941c3e090c084d4733ef172b83f6fe8dfd
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
Bug: 120848293 Change-Id: Idff03bd5fb5542cca89563acdaf441277b17f90f
2019-02-20[automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master am: ↵Xin Li
85722738b9 -s ours am: eb69be82f4 -s ours am: b7fcc111b7 -s ours am skip reason: subject contains skip directive Change-Id: I3dc04b878cfb9d39f468cad199c679c685e555fe
2019-02-20[automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master am: ↵Xin Li
85722738b9 -s ours am: eb69be82f4 -s ours am skip reason: subject contains skip directive Change-Id: I762c1ba0200a314b0574a0287d3c9e902e20b6cf
2019-02-20[automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into masterXin Li
am: 85722738b9 -s ours am skip reason: subject contains skip directive Change-Id: I4f9a3e3802b5bf8c9dcf925a846b78c37bb41d85
2019-02-18DO NOT MERGE - Merge PPRL.190205.001 into masterandroid-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10oreo-mr1-iot-releaseXin Li
Bug: 124234733 Change-Id: I90b834b483440832ad988373377403bd0bf94a4c
2019-02-14[automerger skipped] DO NOT MERGE - Merge pi-platform-release ↵Xin Li
(PPRL.190205.001) into stage-aosp-master am: 1b00213918 -s ours am: 288d592f5b -s ours am skip reason: subject contains skip directive Change-Id: I8c465e303cdd5be00eb7372dde71ebdae5ab3b8a
2019-02-14[automerger skipped] DO NOT MERGE - Merge pi-platform-release ↵Xin Li
(PPRL.190205.001) into stage-aosp-master am: 1b00213918 -s ours am skip reason: subject contains skip directive Change-Id: I5e11426f13323141cdb7a020cbb8910210b2b2c8
2019-02-12DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into ↵temp-124234733-masterXin Li
stage-aosp-master Bug: 124234733 Change-Id: I74842f9e4b1494a5076cf3ae4d0f59393f49ee09
2019-02-09Snap for 5180536 from 956419013f169f756404de89aad50c75d3b02bde to ↵pie-platform-releaseandroid-build-team Robot
pi-platform-release Change-Id: Ie78f980b6a08db7932464d77231086b898aec4a2
2018-12-13Remove unused variable. am: 30d1d22c70 am: 0e7b826d97Dan Albert
am: f37751d23f Change-Id: I66f95b985a705545401f628472b0da76674bcd31
2018-12-13Remove unused variable. am: 30d1d22c70Dan Albert
am: 0e7b826d97 Change-Id: Ic7ea2c1b06652176982e2183159a1f7d2fbbecfb
2018-12-13Remove unused variable.Dan Albert
am: 30d1d22c70 Change-Id: Idfbfb636660251f632649213256e15a1a1b4a9a3
2018-12-12Remove unused variable.android-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7Dan Albert
This doesn't fire until libc++ is updated. Presumably this used to have some side effect that it shouldn't have had. Test: m checkbuild Bug: None Change-Id: Ic60e0885799143efde23b91b05e5c1afd8356ae9
2018-12-05[automerger skipped] DO NOT MERGE am: 1dcb951d11 -s ours am: 99aec6aaae -s ↵Xin Li
ours am: 950d583bab -s ours Change-Id: I506987179bf82c7a742e62a2ab394a57f048bdcc
2018-12-05[automerger skipped] DO NOT MERGE am: 1dcb951d11 -s oursXin Li
am: 99aec6aaae -s ours Change-Id: I4d213e664b44abb6857d1ff5804a0be50d4ee730
2018-12-05[automerger skipped] DO NOT MERGEXin Li
am: 1dcb951d11 -s ours Change-Id: I8a61a3b050222ddb560c01cc94243f08abf1745b
2018-12-05DO NOT MERGEXin Li
Merge pie-platform-release (PPRL.181105.017, history only) into master Bug: 118454372 Change-Id: Iae491c14dbace99e61460d4d69366f1c65288433
2018-11-28Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-releaseBill Yi
Change-Id: Ibbb2d0e7d7e587af96929bffc4c8c04f34263a5c
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: a2f15dbbe4 -s ours am: 17d5a65498 -s ours am: 1eda65621f -s ours Change-Id: I10ff996671bc6345e8bcc75b6a6e2b1b341e6fe9
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: a2f15dbbe4 -s ours am: 17d5a65498 -s ours Change-Id: I4b2f1e4a96b9ee70573507d269238a90f8587596
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi
am: a2f15dbbe4 -s ours Change-Id: I449d444da0f6b9521e4f252ff354ecf7d6c8aa52
2018-10-24Merge pie-platform-release to aosp-master - DO NOT MERGEandroid-wear-8.0.0_r2android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r40.1Jandroid-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r39android-o-mr1-iot-release-smart-display-r30android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-cube_r2android-o-mr1-iot-release-cube-fsiandroid-o-mr1-iot-release-cube-fcsandroid-n-iot-release-ihome-igv1nougat-iot-releaseBill Yi
Change-Id: Ie003d82ff439301638c4f56fb4848d89f877b0da
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: 1b22f9e4e4 -s ours am: 2eea21cd2b -s ours Change-Id: I2e49a8f4e41f3f0c0c0e138ea1a7243aad6f3e9a
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: 1b22f9e4e4 -s ours Change-Id: I810ba1d8dcf9d0e5b0e294dc9e0030842aa42306
2018-10-24Merge pi-platform-release to stage-aosp-master - DO NOT MERGEBill Yi
Change-Id: Ia8a1706928c32732e087e3472d1b2fb435c18c9f
2018-10-23Build bootctrl.sdm845 using Android.bpHridya Valsaraju
This is required to build a recovery variant of the same to be used by fastbootd. Bug: 78793464 Test: make Change-Id: I2774c5cdb7013be2f59f10d84cfff94cb1a842c4
2018-10-19Merge pi-dr1-dev to aosp-master am: a5df18f6a0 am: 1275b15136Bill Yi
am: b7a6ef5292 Change-Id: I759b48343aec7d0b39cbe3ce8e288b69cef8b7a2
2018-10-19Merge pi-dr1-dev to aosp-master am: a5df18f6a0Bill Yi
am: 1275b15136 Change-Id: Ic8c6a0b7561b86919e2db510d0fcb7e136cf92cb
2018-10-19Merge pi-dr1-dev to aosp-masterBill Yi
am: a5df18f6a0 Change-Id: Ic0857c3784c38313aae1e87779a30a09b637046b
2018-10-19Merge pi-dr1-dev to aosp-masterBill Yi
Change-Id: Icec550a9ce3a2345bd90a8aec251b32204a8d04c
2018-10-02Snap for 5044688 from f5db01c3b14d720f3d603cfb3b887d89c2b11b28 to ↵android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31pie-qpr2-releaseandroid-build-team Robot
pi-qpr2-release Change-Id: I8d56f801f009a49cbd8a2f7f2908d3da2721833b
2018-08-28bootcontrol: Add TARGET_USES_HARDWARE_QCOM_BOOTCTRL am: f5db01c3b1Andrew Chant
am: 7446de7821 Change-Id: I0d79cb42353e051a9bc78965ed4d567e7802a0cf
2018-08-28bootcontrol: Add TARGET_USES_HARDWARE_QCOM_BOOTCTRLAndrew Chant
am: f5db01c3b1 Change-Id: I0ee15002cc9f3a147871052f797fdaa7fb464006
2018-08-27bootcontrol: Add TARGET_USES_HARDWARE_QCOM_BOOTCTRLandroid-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r37android-9.0.0_r36pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-b4s4-devAndrew Chant
Allow adding board platform targets to use shared qualcomm bootctrl repo. Bug: 112931783 Change-Id: I958bcf29da2ea5914ac503e9d209c75ce44f1e51
2018-08-13Merge stage-dr1-aosp-master into stage-aosp-master am: 08a2b850a5Xin Li
am: e9d83e38d0 Change-Id: I66d484823a7ebd93148e26a1c96c3f1d54702622
2018-08-13Merge stage-dr1-aosp-master into stage-aosp-masterXin Li
am: 08a2b850a5 Change-Id: Ibfc8c0b3a4e923ed79ad0964e9deecbd25db4b3f
2018-08-13Merge stage-dr1-aosp-master into stage-aosp-masterpie-tempXin Li
Bug: 112535855 Change-Id: I080ba52b88eaef2698595f8256d1b60df21cdb95
2018-08-08Merge Android Pie into master am: 8a744d061b am: 033dcaf9d7 am: b23c9b8653Xin Li
am: 8f971bf075 Change-Id: I8d129ff0d0fa7206bfa97f9aa7d45d961579d370
2018-08-07Merge Android Pie into master am: 8a744d061b am: 033dcaf9d7Xin Li
am: b23c9b8653 Change-Id: Id0f16d7398e3eb10162e528b3ccd43bc1419e7eb
2018-08-07Merge Android Pie into master am: 8a744d061bXin Li
am: 033dcaf9d7 Change-Id: Id200edbf4151e6dfbfcf284eca9e72d0d5cccd5d
2018-08-07Merge Android Pie into masterXin Li
am: 8a744d061b Change-Id: I8f8793a4903dddba8196fac1bb7052fc14a186d5
2018-08-06Merge Android Pie into masterandroid-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-releaseXin Li
Bug: 112104996 Change-Id: I529185d80380b948297d3c367cce30b7dec8de54
2018-07-20Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master am: ab36b830e9Xin Li
am: 88b024e2d9 Change-Id: Icaf73793f6f138c2bf761e42873296e76d36ca88
2018-07-19Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-masterXin Li
am: ab36b830e9 Change-Id: I174d69d4ddf015d1c5da11432b4e4a16284d23d9
2018-07-19Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-masterXin Li
Bug: 111615259 Change-Id: I59eeac7de144c581b2582204af2dd2c6978fe351
2018-07-17Android.mk: add sdm710 am: a8e07aecb2Roger Liao
am: 625f17468a Change-Id: I1b5d05686f881efb514c8c58c254fafe1b776d81
2018-07-17Android.mk: add sdm710Roger Liao
am: a8e07aecb2 Change-Id: I501638ac6206cb407ceea2bdbe6b19deab7f068b
2018-07-13Android.mk: add sdm710android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16pie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-devRoger Liao
Fixes the following build error: error: update_engine_sideload (EXECUTABLES android-arm64) missing bootctrl.sdm710 (STATIC_LIBRARIES android-arm64) Bug: 111163725 Change-Id: I82f2321d580cb2fdb15d2343e39abed5ccda50b1
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 22:07:50 +0000