summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-05-10Merge "Snap for 11819167 from 1e0c6e19d0c7eec5745311bb9e8d2ae1f79eff33 to ↵busytown-mac-infra-releaseAndroid Build Coastguard Worker
busytown-mac-infra-release" into busytown-mac-infra-release
2024-05-10Snap for 11819167 from 1e0c6e19d0c7eec5745311bb9e8d2ae1f79eff33 to ↵Android Build Coastguard Worker
busytown-mac-infra-release Change-Id: I1d1becf217f275ab7b177b6f2557addb166e01da
2024-04-23Merge "Snap for 11754915 from 577a4b6a0352293d28a0a13dc2f28e996ae5f445 to ↵sdk-releaseAndroid Build Coastguard Worker
sdk-release" into sdk-release
2024-04-23Snap for 11754915 from 577a4b6a0352293d28a0a13dc2f28e996ae5f445 to sdk-releaseAndroid Build Coastguard Worker
Change-Id: Id0b1d242581e913f8c30e8295fce879ae7f7972b
2024-04-22Merge "Migrate Test Targets to New Android Ownership Model" into mainHEADmastermainTreehugger Robot
2024-03-07Merge "Snap for 11541002 from 2aa25d6bfd997e84326184cd3d31af1b2715158c to ↵platform-tools-35.0.1Android Build Coastguard Worker
sdk-release" into sdk-release
2024-03-07Snap for 11541002 from 2aa25d6bfd997e84326184cd3d31af1b2715158c to sdk-releaseAndroid Build Coastguard Worker
Change-Id: If432ed14b392484af30577ba59b2f0bdc6a81797
2024-02-02Migrate Test Targets to New Android Ownership ModelAditya Choudhary
This CL is created as a best effort to migrate test targets to the new Android ownership model. It is based on historical data from repository history and insights from git blame. Given the nature of this effort, there may be instances of incorrect attribution. If you find incorrect or unnecessary attribution in this CL, please create a new CL to fix that. For detailed guidelines and further information on the migration please refer to the link below, go/new-android-ownership-model Bug: 304529413 Test: N/A Change-Id: I952bd9766ce21596f89860585d16590744180939
2024-01-04Merge "Snap for 11271525 from 63b8b27393f973de4fea6bb315fbb1f9764405d8 to ↵Android Build Coastguard Worker
sdk-release" into sdk-release
2024-01-04Snap for 11271525 from 63b8b27393f973de4fea6bb315fbb1f9764405d8 to sdk-releaseAndroid Build Coastguard Worker
Change-Id: Id7a1cecc6c40a0238118c57d61331ab106e98ad6
2024-01-03Merge "Removing spurious check." into main am: 63b8b27393 am: 9b302509d3 am: ↵Treehugger Robot
53ae1b819b Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/2876770 Change-Id: I9a9514ca0c0ee1c3c991782e5d3b6896a4379ab9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-03Merge "Removing spurious check." into main am: 63b8b27393 am: 9b302509d3Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/2876770 Change-Id: I05403a75f2de8261c6cf5d43cf72794b3133917e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-03Merge "Removing spurious check." into main am: 63b8b27393Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/2876770 Change-Id: Ieea24358086b24de0f694140aa741373c007bc34 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-03Merge "Removing spurious check." into mainTreehugger Robot
2023-12-15Removing spurious check.Shaju Mathew
Bug: N/A Test: Treehugger presubmit. Change-Id: I68c5c0c8c5675eeeabd39cf95ac6bc70c47354e4
2023-12-13Merge "Snap for 11211409 from d3dc2091b035bbfd8cc6e155320593af4259b939 to ↵Android Build Coastguard Worker
sdk-release" into sdk-release
2023-12-13Snap for 11211409 from d3dc2091b035bbfd8cc6e155320593af4259b939 to sdk-releaseAndroid Build Coastguard Worker
Change-Id: I5f9694c690c0defbe4ca2adedf9b4eed9a72cdb2
2023-11-15Merge "Snap for 11098506 from 47c6f1c1c0d0b0e8badb3e33e2df707232fb20ca to ↵Android Build Coastguard Worker
sdk-release" into sdk-release
2023-11-15Snap for 11098506 from 47c6f1c1c0d0b0e8badb3e33e2df707232fb20ca to sdk-releaseAndroid Build Coastguard Worker
Change-Id: Ib765f817988a9803ee61ef0dab307235aafc7e5c
2023-11-10Merge "Convert the Android.mk of CalendarTests to Android.bp" into main am: ↵Treehugger Robot
47c6f1c1c0 am: 622fb5b27b am: 055931e703 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/2819238 Change-Id: Ie623a31582426997f281df4c669c4f847ba8bf3f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10Merge "Convert the Android.mk of CalendarTests to Android.bp" into main am: ↵Treehugger Robot
47c6f1c1c0 am: d3dc2091b0 am: 4e006d5c10 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/2819238 Change-Id: If8d449c4248a7de82e2c0b6e7e632603460b28ac Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10Merge "Convert the Android.mk of CalendarTests to Android.bp" into main am: ↵Treehugger Robot
47c6f1c1c0 am: 622fb5b27b Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/2819238 Change-Id: Idba0793e42de6916e9b9364c6f1f82f481f23caf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10Merge "Convert the Android.mk of CalendarTests to Android.bp" into main am: ↵Treehugger Robot
47c6f1c1c0 am: d3dc2091b0 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/2819238 Change-Id: I9241322830fffcce57881b8446b0859c03195bf1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10Merge "Convert the Android.mk of CalendarTests to Android.bp" into main am: ↵Treehugger Robot
47c6f1c1c0 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/2819238 Change-Id: I8f532de5fbf0acf2b3fa261620dfa9dfd386d110 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10Merge "Convert the Android.mk of CalendarTests to Android.bp" into main am: ↵Treehugger Robot
47c6f1c1c0 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/2819238 Change-Id: I1e2d7046293aa59ee495e9721c50b44723cb679f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10Merge "Convert the Android.mk of CalendarTests to Android.bp" into mainTreehugger Robot
2023-11-09Merge "Snap for 11073167 from f0cdbc1398c43b4b662a2aab7f6e1323f1b36dec to ↵Android Build Coastguard Worker
sdk-release" into sdk-release
2023-11-09Snap for 11073167 from f0cdbc1398c43b4b662a2aab7f6e1323f1b36dec to sdk-releaseAndroid Build Coastguard Worker
Change-Id: I7d8ccc464ae631a7b46137e4b2d90e271860167a
2023-11-08Merge "Remove unused LOCAL_STATIC_JAVA_LIBRARIES for CalendarTests" into ↵Bill Yang
main am: f0cdbc1398 am: f9eac8bd41 am: a374c20f08 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/2819237 Change-Id: Ib9e26d0cf96e7f52cb4a48a57437c8a0678b1c73 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08Merge "Remove unused LOCAL_STATIC_JAVA_LIBRARIES for CalendarTests" into ↵Bill Yang
main am: f0cdbc1398 am: 90fb9cf984 am: 45cfa9cc4b Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/2819237 Change-Id: I66692cb299ee1e4becf89a83f703d9c4c0ca8e3c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08Merge "Remove unused LOCAL_STATIC_JAVA_LIBRARIES for CalendarTests" into ↵Bill Yang
main am: f0cdbc1398 am: f9eac8bd41 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/2819237 Change-Id: Ie891ba110518c81c5402e5a46911e73cf733f194 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08Merge "Remove unused LOCAL_STATIC_JAVA_LIBRARIES for CalendarTests" into ↵Bill Yang
main am: f0cdbc1398 am: 90fb9cf984 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/2819237 Change-Id: I4b0ebb06b1b3bfb2fe351eb2f8bbf163de130fd2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08Merge "Remove unused LOCAL_STATIC_JAVA_LIBRARIES for CalendarTests" into ↵Bill Yang
main am: f0cdbc1398 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/2819237 Change-Id: I06a3efcaa556f808ab80f8c2a23df06212dfe282 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08Merge "Remove unused LOCAL_STATIC_JAVA_LIBRARIES for CalendarTests" into ↵Bill Yang
main am: f0cdbc1398 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/2819237 Change-Id: Ie24a8df4651f8962f85476c54717769fe184e8f7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08Merge "Remove unused LOCAL_STATIC_JAVA_LIBRARIES for CalendarTests" into mainBill Yang
2023-11-08Convert the Android.mk of CalendarTests to Android.bpyangbill
Convert the CalendarTests's Android.mk to Android.bp and fix the missing Calendar apk dependency issue. Bug: 309369509 Test: atest CalendarTests Change-Id: I3d59f7867cf0fc1af6e0d860b7ad6503c61f4230
2023-11-07Remove unused LOCAL_STATIC_JAVA_LIBRARIES for CalendarTestsyangbill
The original definition of android.test.runner is actually be overwrite by android-common which is actually not being used in make but it will cause error when switching to Android.bp using androidmk tool due to the tools will define both libs in Android.bp which is actually not being used. Bug: 309369509 Test: m CalendarTests Change-Id: Ib6796ab5c1ad2ad18912d72d3c4edc5f7b66e360
2023-10-11Merge "Snap for 10929834 from 1b5c4779fb69c14aa95c4e887e9e4f3b9f65a3db to ↵Android Build Coastguard Worker
sdk-release" into sdk-release
2023-10-10Snap for 10929834 from 1b5c4779fb69c14aa95c4e887e9e4f3b9f65a3db to sdk-releaseAndroid Build Coastguard Worker
Change-Id: I9ee273bd900d803b6fafe71a6bd4fe53cfeef123
2023-10-07[automerger skipped] Merge "Merge Android 14" into main am: 1b5c4779fb -s ↵Xin Li
ours am: 2b0d8aea21 -s ours am: ac34b3a98b -s ours am: e74e5cb1b3 -s ours am: e5fb0b096e -s ours am skip reason: Merged-In Ibce5153b3606549b9f43cadd591965d636cc31e5 with SHA-1 37fbdff885 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/2777035 Change-Id: Id6e5a592fb3de8cd89d433586f678db39eb59d96 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-07[automerger skipped] Merge Android 14 am: 222d20591d -s ours am: 63858fcdde ↵Xin Li
-s ours am: 8aa4e639c3 -s ours am: f9bb6eed27 -s ours am: a7ccae6f6a -s ours am skip reason: Merged-In Ibce5153b3606549b9f43cadd591965d636cc31e5 with SHA-1 37fbdff885 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/2777035 Change-Id: I5bb2e45b693a8959840e1ec9b18fbdcd0cebda78 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge "Merge Android 14" into main am: 1b5c4779fb -s ↵Xin Li
ours am: 2b0d8aea21 -s ours am: ac34b3a98b -s ours am: e74e5cb1b3 -s ours am skip reason: Merged-In Ibce5153b3606549b9f43cadd591965d636cc31e5 with SHA-1 37fbdff885 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/2777035 Change-Id: Ib76b6c0fb242b6957df19f23bdb4463eb1ddc55f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 222d20591d -s ours am: 63858fcdde ↵Xin Li
-s ours am: 8aa4e639c3 -s ours am: f9bb6eed27 -s ours am skip reason: Merged-In Ibce5153b3606549b9f43cadd591965d636cc31e5 with SHA-1 37fbdff885 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/2777035 Change-Id: Idad0da39d0783ec3ba966dab6827e1ddf395924a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge "Merge Android 14" into main am: 1b5c4779fb -s ↵Xin Li
ours am: 2b0d8aea21 -s ours am: ac34b3a98b -s ours am skip reason: Merged-In Ibce5153b3606549b9f43cadd591965d636cc31e5 with SHA-1 37fbdff885 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/2777035 Change-Id: I98caf5264a01fbce7d62fa69d843075afe4ceecf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 222d20591d -s ours am: 63858fcdde ↵Xin Li
-s ours am: 8aa4e639c3 -s ours am skip reason: Merged-In Ibce5153b3606549b9f43cadd591965d636cc31e5 with SHA-1 37fbdff885 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/2777035 Change-Id: I2b9c69a12978e2c3a700cdc71cb4c0541123b268 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge "Merge Android 14" into main am: 1b5c4779fb -s ↵Xin Li
ours am: 2b0d8aea21 -s ours am skip reason: Merged-In Ibce5153b3606549b9f43cadd591965d636cc31e5 with SHA-1 37fbdff885 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/2777035 Change-Id: I6f6a9450d923fe243bb686d289d31b5b8655b9cd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 222d20591d -s ours am: 63858fcdde ↵Xin Li
-s ours am skip reason: Merged-In Ibce5153b3606549b9f43cadd591965d636cc31e5 with SHA-1 37fbdff885 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/2777035 Change-Id: I4d3b004b85b234678ded80caa968b617c61c01a8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge "Merge Android 14" into main am: 1b5c4779fb -s oursXin Li
am skip reason: Merged-In Ibce5153b3606549b9f43cadd591965d636cc31e5 with SHA-1 37fbdff885 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/2777035 Change-Id: I35a16fce5ba8bddad99394fdb216f4f76ac80a2b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 222d20591d -s oursXin Li
am skip reason: Merged-In Ibce5153b3606549b9f43cadd591965d636cc31e5 with SHA-1 37fbdff885 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/2777035 Change-Id: Ic164918bac6abafe69a4902489b53c51baed9c47 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06Merge "Merge Android 14" into mainXin Li
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-31 04:39:57 +0000