aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-24Merge changes I8f5cd126,Ifdb59336,I6abae5ae,I5ec909df am: d135966357 am: ↵Pete Bentley
d8911c6e95 Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1601635 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib00d0e3bda09315496b61b51b207bd8981c947e7
2021-02-24Merge changes I8f5cd126,Ifdb59336,I6abae5ae,I5ec909df am: d135966357Pete Bentley
Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1601635 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I05d47d7655c50db318c4060118dfcd98af542a45
2021-02-24Merge changes I8f5cd126,Ifdb59336,I6abae5ae,I5ec909dfPete Bentley
* changes: Remove support for stuck threads Remove DisableOnDebug (new in 4.12) as it is not supported on Android Extra generic type information to aid certain javacs. Upgrade external/junit to 4.13.2
2021-02-23Remove support for stuck threadsPaul Duffin
The experimental support for stuck threads requires access to the java.lang.management package which is not supported on Android. Bug: 129054170 Test: m checkbuild Change-Id: I8f5cd12661c1559a3d144858a5a8a742e5adba9e (cherry picked from commit 4156f43b51c6f2d42df6e45535e1967aa46514d3)
2021-02-23Remove DisableOnDebug (new in 4.12) as it is not supported on AndroidPaul Duffin
It requires classes from the java.lang.management package which is not supported on Android. Bug: 129054170 Test: m Change-Id: Ifdb59336df4a4695d1f873755daa02d6042775c6 (cherry picked from commit c8055484aac0d002d00140b789711414f4130428)
2021-02-23Extra generic type information to aid certain javacs.Pete Bentley
In particular this is needed for the code to compile using the error prone analyzer. Bug: 129054170 Test: m Change-Id: I6abae5aedc567d3c6a991046551b62a08a8b3337 (cherry picked from commit a0b1fd6752e65aaeaddb1684cdbb1baabfa85433)
2021-02-22Upgrade external/junit to 4.13.2Pete Bentley
Contains just the changes from 4.12 to 4.13.2 and undoes local Android changes. Will re-patch those in in subsequent CLs. Bug: 129054170 Test: m Change-Id: I5ec909df6840f6c54cbab9c509c5addaee3f94e6
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: dae4d9403d -s oursXin Li
am skip reason: Change-Id Iec1673a5d3b9cf750b75cf0c3cee86c38ecbb546 with SHA-1 f86beaa2f1 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5d0304edc612fe3f6f62ad946956993680c504cb
2021-02-20Mark ab/7061308 as merged in stage.Xin Li
Bug: 180401296 Merged-In: Iec1673a5d3b9cf750b75cf0c3cee86c38ecbb546 Change-Id: I4bd32fba1677f6b150c3930772c3546272868d74
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/junit" am: e938015d2d am: ↵Bob Badour
730701d221 Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1588866 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib7125f6183726bfdc789395963a18bdaa0023d47
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/junit" am: e938015d2dBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1588866 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I10c766fe80ee5cf519454496c0b73622d4a50c81
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/junit"android-s-preview-1Bob Badour
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/junitBob Badour
Added SPDX-license-identifier-EPL to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I9cd43f586feb5cd5906cd6b649dd5f020836136c
2020-11-24Mark ab/6881855 as merged am: 9393ddd7a0Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/junit/+/13110683 Change-Id: Iec1673a5d3b9cf750b75cf0c3cee86c38ecbb546
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: Ie071e74b49de9ad7e24916f217a48fd00d4bd280
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: e6d0e25c0a -s ours am: ↵Xin Li
8535401e0e -s ours am skip reason: Change-Id I2fb4f0e6ae5034296a59aea4f2f6ab425a76b15d with SHA-1 68c5822c91 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/junit/+/12796462 Change-Id: I7f1c86de3c610b71ed726d5611b8d361cfd5be8a
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: e6d0e25c0a -s oursXin Li
am skip reason: Change-Id I2fb4f0e6ae5034296a59aea4f2f6ab425a76b15d with SHA-1 68c5822c91 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/junit/+/12796462 Change-Id: Ia7bc88b0936ff6943321c2df117cb3e586d86622
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I2fb4f0e6ae5034296a59aea4f2f6ab425a76b15d Change-Id: Icd25eae932b0da95ff4d92328e4c457945decbc9
2020-09-11[automerger skipped] Merge "Merge Android R" am: 0d2651b058 -s ours am: ↵Xin Li
b592c33440 -s ours am: 3c864506c3 -s ours am: 1a7c6dde68 -s ours am skip reason: Change-Id I0e3537670da38a92f5a3a82290db17fc0570cb5a with SHA-1 2cf517dad5 is in history Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1422333 Change-Id: I755d2217483642cace074a0a03cf588912a6ba3e
2020-09-11[automerger skipped] Merge "Merge Android R" am: 0d2651b058 -s ours am: ↵Xin Li
b592c33440 -s ours am: 3c864506c3 -s ours am skip reason: Change-Id I0e3537670da38a92f5a3a82290db17fc0570cb5a with SHA-1 2cf517dad5 is in history Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1422333 Change-Id: Iba304cdd5c175d26a49245f3a7282079cfa3abbd
2020-09-11[automerger skipped] Merge "Merge Android R" am: 0d2651b058 -s ours am: ↵Xin Li
b592c33440 -s ours am skip reason: Change-Id I0e3537670da38a92f5a3a82290db17fc0570cb5a with SHA-1 2cf517dad5 is in history Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1422333 Change-Id: Id57267bde02299dae7d802551237f3382bc2bf26
2020-09-11[automerger skipped] Merge "Merge Android R" am: 0d2651b058 -s oursXin Li
am skip reason: Change-Id I0e3537670da38a92f5a3a82290db17fc0570cb5a with SHA-1 2cf517dad5 is in history Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1422333 Change-Id: If01b5b0bc49f5d578648f4bc5935981b364e8a10
2020-09-10Merge "Merge Android R"Xin Li
2020-09-08Merge Android RXin Li
Bug: 168057903 Merged-In: I0e3537670da38a92f5a3a82290db17fc0570cb5a Change-Id: I3a4960ce4279bf5722ef787f98a2762b976645b5
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 2cf517dad5 -s ours am: 273aed17d3 -s ours am: 8afee8df59 -s ours am skip reason: Change-Id I38fc37dadb4e0f3f4540c18e48660456768d0c3e with SHA-1 b50af440ad is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/junit/+/12469998 Change-Id: I1fab34e69e96aab4cbc37f5767af2ec7320453d9
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 2cf517dad5 -s ours am: 273aed17d3 -s ours am skip reason: Change-Id I38fc37dadb4e0f3f4540c18e48660456768d0c3e with SHA-1 b50af440ad is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/junit/+/12469998 Change-Id: I1e2b63146ae67e8c68ee0223ca3772362d0458aa
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 2cf517dad5 -s ours am skip reason: Change-Id I38fc37dadb4e0f3f4540c18e48660456768d0c3e with SHA-1 b50af440ad is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/junit/+/12469998 Change-Id: I2ea99a0044fc81ef241ba6611b2042792dafed97
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903Xin Li
Bug: 166295507 Merged-In: I38fc37dadb4e0f3f4540c18e48660456768d0c3e Change-Id: I0e3537670da38a92f5a3a82290db17fc0570cb5a
2020-04-24Merge "Add license type: contains EPL = RECIPROCAL license" am: bd7455035a ↵Treehugger Robot
am: 6fac8fec6c am: b50af440ad am: 68c5822c91 Change-Id: I99a6f46afe89dc1ad88636e758547e5483fdf64f
2020-04-24Merge "Add license type: contains EPL = RECIPROCAL license" am: bd7455035a ↵Treehugger Robot
am: 6fac8fec6c am: b50af440ad Change-Id: I2fb4f0e6ae5034296a59aea4f2f6ab425a76b15d
2020-04-24Merge "Add license type: contains EPL = RECIPROCAL license" am: bd7455035a ↵Treehugger Robot
am: 6fac8fec6c Change-Id: I38fc37dadb4e0f3f4540c18e48660456768d0c3e
2020-04-24Merge "Add license type: contains EPL = RECIPROCAL license" am: bd7455035aandroid-r-beta-3android-r-beta-2Treehugger Robot
Change-Id: I5accc5971cd729e7a6f27a2dfb85d93e7c596bcb
2020-04-24Merge "Add license type: contains EPL = RECIPROCAL license"Treehugger Robot
2020-04-23Add license type: contains EPL = RECIPROCAL licenseBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: I8b820dc41c74231bc99f57617af50840ce20d63f
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 23eb5b6109 -s ours am: d74f6bfccb am: 26adab2269 Change-Id: I3bca2b6ba8753a37deba0df0e39237ca999e7a1b
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 23eb5b6109 -s ours am: d74f6bfccb Change-Id: Ic7a2fb8c1692fdc2fa748face2f21a8b23d8e73d
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 23eb5b6109 -s ours am skip reason: subject contains skip directive Change-Id: Ic89d6984dd051927f17bebffb858143c319d340f
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: I1a0a4b4fc29b07b50e3d89aba64383e314f39b0f
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 49f40ab7c8 -s ours am: 1e1be6dfb4 am: e8a12cf792 Change-Id: I7ba85d4b4f120272d839f6ebf29228d24e131929
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 49f40ab7c8 -s ours am: 1e1be6dfb4 Change-Id: I1077b7ca5d6cffe52e5992d1faa32d4fb6a659bf
2020-03-19DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into ↵Xin Li
stag-aosp-master am: 49f40ab7c8 Change-Id: Ia08140c3362320a57fd3608147109dda3c26247d
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 49f40ab7c8 -s ours am skip reason: subject contains skip directive Change-Id: I44a60b3eb3b26a3c3f7f15da48186a82c918b36f
2020-03-18DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: I30168a0db73a6ab4edb9f271ee0e912ab892674f
2020-02-25Merge "Add jgaillard to OWNERS" am: 4630740bf7 am: ed077a7e06 am: 0fad8265cd ↵Automerger Merge Worker
am: e8fb6fdb11 Change-Id: Id99df4ea5983c820b06bc977a725282994b74312
2020-02-25Merge "Add jgaillard to OWNERS" am: 4630740bf7 am: ed077a7e06 am: 0fad8265cdAutomerger Merge Worker
Change-Id: I8873012c65dde9a4e95b3700473841928410adb8
2020-02-25Merge "Add jgaillard to OWNERS" am: 4630740bf7 am: ed077a7e06Automerger Merge Worker
Change-Id: Ie0603bfb9c07642857f731907a073a1dc4f8fb2a
2020-02-25Merge "Add jgaillard to OWNERS" am: 4630740bf7 am: ed077a7e06Automerger Merge Worker
Change-Id: I1736daf588c93b60d065aa936a0a7616ef620721
2020-02-25Merge "Add jgaillard to OWNERS" am: 4630740bf7android-r-preview-4android-r-preview-3android-r-preview-2Automerger Merge Worker
Change-Id: I96d92457de3ad0fc0f6a389c5106e7d27350d5db
2020-02-25Merge "Add jgaillard to OWNERS"Treehugger Robot
2020-02-25Add jgaillard to OWNERSPaul Duffin
Test: m nothing Change-Id: I4114606985b6da7b5fdc9d910c7f38d637c0b8f3
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-12 23:36:53 +0000