summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-05-31Merge "Remove Android.mk rules for building bootctrl. am: 7bde6868ff am: ↵android-r-preview-4android-r-preview-3android-r-preview-2android-r-preview-1android-mainline-10.0.0_r8android-mainline-10.0.0_r6android10-mainline-resolv-releaseandroid10-mainline-networking-releaseTao Bao
308431ceb7" into qt-dev-plus-aosp am: 6bd5b61b99 Change-Id: Ied1ad3ab0a7a1e555aac2343c20a87d794873e9f
2019-05-31Remove Android.mk rules for building bootctrl. am: 7bde6868ff am: 308431ceb7Tao Bao
am: cf2985d914 Change-Id: I65b765e0c382f6c377a98e2b56703c94cf799c59
2019-05-31Merge "Remove Android.mk rules for building bootctrl. am: 7bde6868ff am: ↵ndk-sysroot-r21Android Build Merger (Role)
308431ceb7" into qt-dev-plus-aosp
2019-05-31Remove Android.mk rules for building bootctrl. am: 7bde6868ffTao Bao
am: 308431ceb7 Change-Id: I30882f03d7eb957452fefc71d2aa85b2b536344f
2019-05-31Remove Android.mk rules for building bootctrl. am: 7bde6868ffTao Bao
am: 308431ceb7 Change-Id: I0120922025265fd8008e83c03661afb433838a86
2019-05-31Remove Android.mk rules for building bootctrl.Tao Bao
am: 7bde6868ff Change-Id: I63a8e9654c1d230e28ec81cb5a0aa83f019ac087
2019-05-28Remove Android.mk rules for building bootctrl.android-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13Tao Bao
All the targets that need the bootctrl.$(TARGET_BOARD_PLATFORM) in this dir should build the module with Android.bp, which is also the desired way to install the recovery variant of bootctrl. [1] has an example change for crosshatch. We also no longer need BOARD_IS_AUTOMOTIVE, as the module must be explicitly included now, in order to be built with namespace-scoped Android.bp. [1] https://android-review.googlesource.com/c/device/google/crosshatch/+/958004 Bug: 34254109 Test: TreeHugger Change-Id: Ib110508065f47a742acd92e03ea42901e8002e4f
2019-05-27[automerger skipped] Build bootctrl.msm8996 with Android.bp. am: b229dfc102 ↵Tao Bao
am: a74148dd46 -s ours am: bd3f15889d -s ours am skip reason: change_id I864bd626d25723bd390b2453022d9cd47a54d2a2 with SHA1 e3818e1e44 is in history Change-Id: I2ea64c40fba8edc642b39a858d89ce075cc3b934
2019-05-27[automerger skipped] Build bootctrl.msm8996 with Android.bp. am: b229dfc102Tao Bao
am: a74148dd46 -s ours am skip reason: change_id I864bd626d25723bd390b2453022d9cd47a54d2a2 with SHA1 e3818e1e44 is in history Change-Id: Ibb29585be357552295e2eafa91a19780751f875f
2019-05-27Build bootctrl.msm8996 with Android.bp.Tao Bao
am: b229dfc102 Change-Id: Ie64758e8599572f491465673c38e1d35c0d8b8d1
2019-05-24Build bootctrl.msm8996 with Android.bp.Tao Bao
Android.mk itself will be removed in a separate CL. Bug: 34254109 Test: TreeHugger Test: Sideloading a package on sailfish. Change-Id: I864bd626d25723bd390b2453022d9cd47a54d2a2 Merged-In: I864bd626d25723bd390b2453022d9cd47a54d2a2 (cherry picked from commit e3818e1e44e3f2b4b0296132dbc185da92f99c66)
2019-05-24Build bootctrl.msm8996 with Android.bp.Tao Bao
am: e3818e1e44 Change-Id: I61c092e143724aaff4da4d0b83b3422e77c28031
2019-05-23Build bootctrl.msm8996 with Android.bp.Tao Bao
Android.mk itself will be removed in a separate CL. Bug: 34254109 Test: TreeHugger Test: Sideloading a package on sailfish. Change-Id: I864bd626d25723bd390b2453022d9cd47a54d2a2
2019-05-23[automerger skipped] Revert^2 "Build bootctrl.msm8998 with Android.bp."" am: ↵Tao Bao
1933d30528 am: 43dc9da33d -s ours am: e0d83c800e -s ours am skip reason: change_id I6a85b7885903df818deb32c40c751ac4358a6dbc with SHA1 b3fede0de5 is in history Change-Id: I0ad32434a309aade5d5d5c75cdbcf0ab27f3449c
2019-05-23[automerger skipped] Revert^2 "Build bootctrl.msm8998 with Android.bp."" am: ↵Tao Bao
1933d30528 am: 43dc9da33d -s ours am skip reason: change_id I6a85b7885903df818deb32c40c751ac4358a6dbc with SHA1 b3fede0de5 is in history Change-Id: Idd58d7f789664bb28574a9f92612d7cdbdb78862
2019-05-23Revert^2 "Build bootctrl.msm8998 with Android.bp.""Tao Bao
am: 1933d30528 Change-Id: I37fe6e2df13148bd257dc0935614263437ddd358
2019-05-23Revert^2 "Build bootctrl.msm8998 with Android.bp.""Tao Bao
am: b3fede0de5 Change-Id: I2cc39b19de80a5ced9e03068c42fac1a9f70bff4
2019-05-22Revert^2 "Build bootctrl.msm8998 with Android.bp.""Tao Bao
This reverts commit 28b533bd96d92d7a3bf880575b183cfffe05cd12. Bug: 34254109 Test: Sideload on taimen. Change-Id: I6a85b7885903df818deb32c40c751ac4358a6dbc Merged-In: I6a85b7885903df818deb32c40c751ac4358a6dbc (cherry picked from commit 7ba68ec1d2175905bbfecab5d4a57503bdcb9f76)
2019-05-22Revert^2 "Build bootctrl.msm8998 with Android.bp.""Tao Bao
This reverts commit 28b533bd96d92d7a3bf880575b183cfffe05cd12. Bug: 34254109 Test: Sideload on taimen. Change-Id: I6a85b7885903df818deb32c40c751ac4358a6dbc Merged-In: I6a85b7885903df818deb32c40c751ac4358a6dbc (cherry picked from commit 7ba68ec1d2175905bbfecab5d4a57503bdcb9f76)
2019-05-22[automerger skipped] Build bootctrl.sdm710 with Android.bp. am: c665a9c43f ↵Tao Bao
am: 11303fbc52 -s ours am: d79ae8a695 -s ours am skip reason: change_id Ib29d901b44ad0ec079c3e979bfdcd467e1a18377 with SHA1 aa97ef614c is in history Change-Id: I5759604db1c98b80792e6b95a89431643d496bf7
2019-05-22[automerger skipped] Build bootctrl.sdm710 with Android.bp. am: c665a9c43fTao Bao
am: 11303fbc52 -s ours am skip reason: change_id Ib29d901b44ad0ec079c3e979bfdcd467e1a18377 with SHA1 aa97ef614c is in history Change-Id: I7e53587f93d9a8623221d8d0236cd36db38c62e7
2019-05-22Build bootctrl.sdm710 with Android.bp.Tao Bao
am: c665a9c43f Change-Id: I0f3fd68c9abddbe3099fce17415dea5cba7888db
2019-05-21Build bootctrl.sdm710 with Android.bp.Tao Bao
am: aa97ef614c Change-Id: Ia898073a447ae935655d9abe698bc81796849daf
2019-05-21Build bootctrl.sdm710 with Android.bp.Tao Bao
Bug: 34254109 Test: TreeHugger Test: Sideloading a package on bonito. Change-Id: Ib29d901b44ad0ec079c3e979bfdcd467e1a18377 Merged-In: Ib29d901b44ad0ec079c3e979bfdcd467e1a18377 (cherry picked from commit aa97ef614cbfaca768fb382a659a764b13879a2b)
2019-05-20Build bootctrl.sdm710 with Android.bp.Tao Bao
Bug: 34254109 Test: TreeHugger Test: Sideloading a package on bonito. Change-Id: Ib29d901b44ad0ec079c3e979bfdcd467e1a18377
2019-05-09[automerger skipped] Build bootctrl.sdm845 using Android.bp am: c5847fc02aHridya Valsaraju
am: 5051c3097b -s ours am skip reason: change_id I2774c5cdb7013be2f59f10d84cfff94cb1a842c4 with SHA1 299fb68f34 is in history Change-Id: I0a98d713a076ee4a864280a23b2f09040d4fd5cc
2019-05-09Build bootctrl.sdm845 using Android.bpHridya Valsaraju
am: c5847fc02a Change-Id: Ic8baddf15049220ba7afac70fbc9d2587ec1610d
2019-05-08Build 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 Bug: 34254109 Change-Id: I2774c5cdb7013be2f59f10d84cfff94cb1a842c4 Merged-In: I2774c5cdb7013be2f59f10d84cfff94cb1a842c4 (cherry picked from commit 299fb68f3461157b7a018d8f46b51ed11f7470a5)
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-18 03:39:36 +0000