summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-08-19Merge "[DO NOT MERGE] Support non-host targets for ATF" into sc-v2-devandroid-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseTreeHugger Robot
2021-08-19[DO NOT MERGE] Support non-host targets for ATFRam Parameswaran
Bug: 193454387 Test: n/a Change-Id: Idde9c2cee27dd901466cb14ddc1c70a5106b8584
2021-08-13[automerger skipped] Merge ab/7633965 am: 2b8aebde61 -s ours am: b2c09d61d4 ↵The Android Open Source Project
-s ours am: f1a323aedf -s ours am skip reason: Merged-In Idde9c2cee27dd901466cb14ddc1c70a5106b8584 with SHA-1 185c7d4a83 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/misc/+/15547622 Change-Id: Ib38d9cd8420baf2ed37b7b4feb48aa3e64cbc35e
2021-08-13[automerger skipped] Merge ab/7633965 am: 2b8aebde61 -s ours am: b2c09d61d4 ↵android-12.0.0_r32android-12.0.0_r29android-12.0.0_r27android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseThe Android Open Source Project
-s ours am skip reason: Merged-In Idde9c2cee27dd901466cb14ddc1c70a5106b8584 with SHA-1 185c7d4a83 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/misc/+/15547622 Change-Id: Iadf3fe1065c00c0aaa99a8d731ae619499f84bb0
2021-08-13[automerger skipped] Merge ab/7633965 am: 2b8aebde61 -s oursThe Android Open Source Project
am skip reason: Merged-In Idde9c2cee27dd901466cb14ddc1c70a5106b8584 with SHA-1 185c7d4a83 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/misc/+/15547622 Change-Id: I1085a03c9127877a5bb8e86286c33e0aebefb73e
2021-08-13[automerger skipped] Merge ab/7633965 am: 2b8aebde61 -s oursThe Android Open Source Project
am skip reason: Merged-In Idde9c2cee27dd901466cb14ddc1c70a5106b8584 with SHA-1 185c7d4a83 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/misc/+/15547622 Change-Id: Idec53548f4fd4933102c197624b0ed08dce16d59
2021-08-12Merge ab/7633965The Android Open Source Project
Bug: 169893837 Merged-In: Idde9c2cee27dd901466cb14ddc1c70a5106b8584 Change-Id: I4d49cabd722f199c8d31521f900a993ea1a05ec3
2021-07-14[automerger skipped] [DO NOT MERGE] Support non-host targets for ATF am: ↵Ram Parameswaran
185c7d4a83 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/misc/+/15261004 Change-Id: I37a50b7a4bb340e498dc0f507fe5d68b1ae59ed3
2021-07-12[DO NOT MERGE] Support non-host targets for ATFandroid12-devRam Parameswaran
Bug: 193454387 Test: n/a Change-Id: Idde9c2cee27dd901466cb14ddc1c70a5106b8584
2021-06-16Update intDefMaping and winscope in prebuiltsCharles Chen
Test: N/A Bug: 190684677 Change-Id: I1919aa8c8cc974e99c511d68d10670e2cc8aeab8
2021-06-10Merge "Add platformtestprotos to prebuilts." into sc-dev am: 11cba379afHarry Zhang
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/misc/+/14823688 Change-Id: I7138074ca06b7ba1dc502453b4c936d194758750
2021-06-10Merge "Add platformtestprotos to prebuilts." into sc-devHarry Zhang
2021-06-03[automerger skipped] Revert "Revert "[DO NOT MERGE] Support non-host targets ↵Ram Parameswaran
for ATF"" am: f06dfa4c7a am: 2fbda50c9d -s ours am: f24fa9c918 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/misc/+/14825131 Change-Id: Ib83da4181683348217f05bcea161b9c0a671f005
2021-06-03[automerger skipped] Revert "Revert "[DO NOT MERGE] Support non-host targets ↵Ram Parameswaran
for ATF"" am: f06dfa4c7a am: 1e737e9f12 -s ours am: bb04789551 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/misc/+/14825131 Change-Id: Idd62645bbc84fa600d38b97a7297ec49e7118655
2021-06-03[automerger skipped] Revert "Revert "[DO NOT MERGE] Support non-host targets ↵Ram Parameswaran
for ATF"" am: f06dfa4c7a am: 2fbda50c9d -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/misc/+/14825131 Change-Id: I148eb7ea15bab8c10b5edc31da0285716f03eb2b
2021-06-03[automerger skipped] Revert "Revert "[DO NOT MERGE] Support non-host targets ↵Ram Parameswaran
for ATF"" am: f06dfa4c7a am: 1e737e9f12 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/misc/+/14825131 Change-Id: Ib892d7160b49838a9c295117a9f9fc2de3b28469
2021-06-03Revert "Revert "[DO NOT MERGE] Support non-host targets for ATF"" am: f06dfa4c7aRam Parameswaran
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/misc/+/14825131 Change-Id: I04103858fa21610470ac546420bf9f1c16763323
2021-06-03Revert "Revert "[DO NOT MERGE] Support non-host targets for ATF"" am: f06dfa4c7aRam Parameswaran
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/misc/+/14825131 Change-Id: I9c43e0ac40466f9071078eb323ee5cc5ae7cb1a5
2021-06-03[automerger skipped] Revert "[DO NOT MERGE] Support non-host targets for ↵Bill Richardson
ATF" am: cc5dc1e344 am: 2939dcd6b9 -s ours am: a390c9d44f -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/misc/+/14824581 Change-Id: If50149134c4e3517c464b87f4dae5f2072ceaee0
2021-06-03[automerger skipped] Revert "[DO NOT MERGE] Support non-host targets for ↵Bill Richardson
ATF" am: cc5dc1e344 am: 2939dcd6b9 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/misc/+/14824581 Change-Id: Ib3a30e4ee59daf24973394903f7fb439e4490650
2021-06-03Revert "[DO NOT MERGE] Support non-host targets for ATF" am: cc5dc1e344Bill Richardson
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/misc/+/14824581 Change-Id: I0c931e84f8454e29c09f57a2c905d11354ee0240
2021-06-03[automerger skipped] Revert "[DO NOT MERGE] Support non-host targets for ↵Bill Richardson
ATF" am: cc5dc1e344 am: e175c29261 -s ours am: 4e2b934081 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/misc/+/14824581 Change-Id: I59d9297cd1359e918734cf93e9bb8b36ba848a85
2021-06-03[automerger skipped] Revert "[DO NOT MERGE] Support non-host targets for ↵Bill Richardson
ATF" am: cc5dc1e344 am: e175c29261 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/misc/+/14824581 Change-Id: Ibc13716a937cff3ae9709c7cb0cc0ec822d5d7df
2021-06-03Revert "[DO NOT MERGE] Support non-host targets for ATF" am: cc5dc1e344Bill Richardson
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/misc/+/14824581 Change-Id: Icb345f9c542417b63fc23ca6526caadb7ca5c1df
2021-06-03Revert "Revert "[DO NOT MERGE] Support non-host targets for ATF""Ram Parameswaran
This reverts commit cc5dc1e344297f34c7b6532f118fb2fe0e9e951c. Reason for revert: CL not responsible for breakage. Was reverted due to inclusion in topic. Bug: 190056666 Change-Id: I42ff2a34d529927ca196138ce9c3c194abf2ba88
2021-06-03[automerger skipped] [DO NOT MERGE] Support non-host targets for ATF am: ↵Ram Parameswaran
2ef3f410b4 am: 113e5c94c5 -s ours am: 7fb1706ce4 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/misc/+/14801744 Change-Id: I6def0beddea31cc6cc32980d31a50e0347635885
2021-06-03Revert "[DO NOT MERGE] Support non-host targets for ATF"Bill Richardson
Revert "[DO NOT MERGE] Refactor Escrow tests" Revert submission 14801744-escrow-updates Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_mainline-prod&target=mainline_modules-userdebug&lkgb=7422332&lkbb=7422648&fkbb=7422648, bug b/190056666 Bug: b/190056666 Reverted Changes: Id38578842:[DO NOT MERGE] Support non-host targets for ATF Ic1aefdb10:[DO NOT MERGE] Refactor Escrow tests Change-Id: Ic3f217b3d52250f1b1d47a9b5c43d62db2f5d3ba
2021-06-03[automerger skipped] [DO NOT MERGE] Support non-host targets for ATF am: ↵Ram Parameswaran
2ef3f410b4 am: 113e5c94c5 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/misc/+/14801744 Change-Id: I3f2f597635a46f487e0352d24f94fcf7ebcadf4b
2021-06-03[automerger skipped] [DO NOT MERGE] Support non-host targets for ATF am: ↵Ram Parameswaran
2ef3f410b4 am: 8bd4b8055e -s ours am: d73d25b641 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/misc/+/14801744 Change-Id: Ia158f6f9e702b7ff015d25e95142e371b106c169
2021-06-03[automerger skipped] [DO NOT MERGE] Support non-host targets for ATF am: ↵Ram Parameswaran
2ef3f410b4 am: 8bd4b8055e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/misc/+/14801744 Change-Id: I72894f0d456ba0a15534c4122d969abfa3e50bbe
2021-06-03[DO NOT MERGE] Support non-host targets for ATF am: 2ef3f410b4Ram Parameswaran
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/misc/+/14801744 Change-Id: I9d4d5571c01c29f336dd941202226b4b5fceec70
2021-06-03Add platformtestprotos to prebuilts.Harry Zhang
Bug: 181921006 Test: The target builds. Change-Id: I7bdee71e8abfdb262a94833c36a5c11e60c88185
2021-06-03[DO NOT MERGE] Support non-host targets for ATF am: 2ef3f410b4Ram Parameswaran
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/misc/+/14801744 Change-Id: Ic64a86dd17fb4c542b962be04348eb9cc557dec8
2021-06-02[DO NOT MERGE] Support non-host targets for ATFRam Parameswaran
Bug: 189943625 Test: n/a Change-Id: Id385788428f9a5af12be5ae6f45046220d7d85d0
2021-05-13Merge "Updates OWNERS files" am: 9e5a79c435 am: 829f9ce9b6 am: fc76981faaTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/prebuilts/misc/+/1706910 Change-Id: I1b04a564913fda819670eb642866059c9fb5e495
2021-05-13Merge "Updates OWNERS files" am: 9e5a79c435 am: 829f9ce9b6Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/prebuilts/misc/+/1706910 Change-Id: I44f0c626f1b77fba05ab6a35440d117197a293d5
2021-05-13Merge "Updates OWNERS files" am: 9e5a79c435Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/prebuilts/misc/+/1706910 Change-Id: I4f464fedc7a032e9122970d9421f31a47f789175
2021-05-13Merge "Updates OWNERS files"android-s-beta-2android-s-beta-1Treehugger Robot
2021-05-13Updates OWNERS filesPatrick Baumann
Bug: 186864416 Test: Builds Change-Id: I4d6cb3d5eafecb14ad7ad02417fa99ccd7eabb84
2021-04-29[automerger skipped] Merge "Refreshing incfs from the recent AS build." am: ↵Treehugger Robot
2be53de8df am: 25af063dff am: 5127543eb3 -s ours am skip reason: Merged-In I947ba83ee11e835967880c1d77d1087c7aef28c4 with SHA-1 f8080ef4ec is already in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/misc/+/1688583 Change-Id: I293bc3082dd825629dfe834b7fbc8defd4e76e7f
2021-04-29Merge "Refreshing incfs from the recent AS build." am: 2be53de8df am: 25af063dffTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/prebuilts/misc/+/1688583 Change-Id: I63fdc38ab4958d4dc3fe7a7ec8fca2930beb0f3e
2021-04-29Merge "Refreshing incfs from the recent AS build." am: 2be53de8dfTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/prebuilts/misc/+/1688583 Change-Id: I56a3c30136989f8402d8adca630b4b4093db4802
2021-04-29Merge "Refreshing incfs from the recent AS build."Treehugger Robot
2021-04-28Refreshing incfs from the recent AS build.Alex Buynytskyy
Bug: 186668681 Test: builds Change-Id: I947ba83ee11e835967880c1d77d1087c7aef28c4 Merged-In: I947ba83ee11e835967880c1d77d1087c7aef28c4
2021-04-28Refreshing incfs from the recent AS build.Alex Buynytskyy
Cherry-pick from AOSP to fix merge conflict. Bug: 186668681 Test: builds Change-Id: I947ba83ee11e835967880c1d77d1087c7aef28c4 Merged-In: I947ba83ee11e835967880c1d77d1087c7aef28c4
2021-04-23Merge "Update ddmlib prebuilt on 2021-04-23 11:14:12.810559" am: 63874c077a ↵Treehugger Robot
am: f463c5cddf am: 3526187db4 Original change: https://android-review.googlesource.com/c/platform/prebuilts/misc/+/1684748 Change-Id: I3a061f01e350c9a15f9259efeec70520c3881e2e
2021-04-23Merge "Update ddmlib prebuilt on 2021-04-23 11:14:12.810559" am: 63874c077a ↵Treehugger Robot
am: f463c5cddf Original change: https://android-review.googlesource.com/c/platform/prebuilts/misc/+/1684748 Change-Id: I63aa59e45bc3104c7f0e2c299e43f279e1c7a2ee
2021-04-23Merge "Remove unused robolectric jars" am: ec365ff0c3 am: 5324b7c2b4 am: ↵Colin Cross
5d70ad7981 Original change: https://android-review.googlesource.com/c/platform/prebuilts/misc/+/1685107 Change-Id: Iddecd44e3076e08dd93b7e5456de8126d63a6433
2021-04-23Merge "Update ddmlib prebuilt on 2021-04-23 11:14:12.810559" am: 63874c077aTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/prebuilts/misc/+/1684748 Change-Id: If9c4d893388d1d17923ad98fb0525673db4d26ca
2021-04-23Merge "Remove unused robolectric jars" am: ec365ff0c3 am: 5324b7c2b4Colin Cross
Original change: https://android-review.googlesource.com/c/platform/prebuilts/misc/+/1685107 Change-Id: I183bed8f232152133bfe95b0b8e947d6a10067a1
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-24 08:13:29 +0000