summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-03-06Merge Android 14 QPR2 to AOSP mainHEADub-automotive-master-20240521ub-automotive-master-20240314mastermainXin Li
Bug: 319669529 Merged-In: I7bbd1d0c8726dbfc642111ea04545c58ea4928cc Change-Id: I53635a02468d56702a5a02918dc42f51579bcf40
2024-01-17Merge Android 24Q1 Release (ab/11220357)temp_319669529Xin Li
Bug: 319669529 Merged-In: I984735f7d4372deaaa77c5a429e775c75dfb166a Change-Id: I7bbd1d0c8726dbfc642111ea04545c58ea4928cc
2023-10-07[automerger skipped] Merge Android 14 am: 7fa37a8f04 -s ours am: e4ad283bbe ↵Xin Li
-s ours am: 92c43359ed -s ours am: ff35eafd00 -s ours am: f83371c43f -s ours am skip reason: Merged-In I9e02d4b8426a66a743ad8a160190ea59a15be522 with SHA-1 10cb9cdd01 is already in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/ktlint/+/2775036 Change-Id: Idee68797d1a17ba75be60e109c8e7f4111cb2bf2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 7fa37a8f04 -s ours am: e4ad283bbe ↵ub-automotive-master-20240125Xin Li
-s ours am: 92c43359ed -s ours am: ff35eafd00 -s ours am skip reason: Merged-In I9e02d4b8426a66a743ad8a160190ea59a15be522 with SHA-1 10cb9cdd01 is already in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/ktlint/+/2775036 Change-Id: I11b40f2155585927250dae007aac1aa8505cf8eb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 7fa37a8f04 -s ours am: e4ad283bbe ↵Xin Li
-s ours am: 92c43359ed -s ours am skip reason: Merged-In I9e02d4b8426a66a743ad8a160190ea59a15be522 with SHA-1 10cb9cdd01 is already in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/ktlint/+/2775036 Change-Id: I6e34a9728f355eaaf73d035e7a9e361da69ce143 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 7fa37a8f04 -s ours am: e4ad283bbe ↵Xin Li
-s ours am skip reason: Merged-In I9e02d4b8426a66a743ad8a160190ea59a15be522 with SHA-1 10cb9cdd01 is already in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/ktlint/+/2775036 Change-Id: I5346cfbe6818e29ab49762dd8493957738e91ef6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 7fa37a8f04 -s oursXin Li
am skip reason: Merged-In I9e02d4b8426a66a743ad8a160190ea59a15be522 with SHA-1 10cb9cdd01 is already in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/ktlint/+/2775036 Change-Id: I762f408f209b9210d7969d51ccf4ef7724931c07 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05Merge Android 14ub-automotive-master-20231102ub-automotive-master-20231011Xin Li
Bug: 298295554 Merged-In: I9e02d4b8426a66a743ad8a160190ea59a15be522 Change-Id: I9ac00e61e849ac9251684d0019cf0148e6a43578
2023-08-30Disable more ktlint rules when we should not check formattingMike Schneider
The check was triggered by existing code Test: Manual Change-Id: I984735f7d4372deaaa77c5a429e775c75dfb166a
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: 5d70a692ea -s ours ↵Xin Li
am: 0b464330dd -s ours am: 6e2e302294 -s ours am: 797eea8f95 -s ours am skip reason: Merged-In Id85e2f80b64a9789407f55e86530548f83743f25 with SHA-1 0a2261d46f is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/ktlint/+/24182593 Change-Id: I234192ba8f36114c3776db87fbd96139f4ee0390 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29Disable more ktlint rules when we should not check formattingJordan Demeulenaere
Test: Manual Change-Id: I93bc719f2ad7bfa7477fb56f36160da1f7ade811
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: 5d70a692ea -s ours ↵Xin Li
am: 0b464330dd -s ours am: 6e2e302294 -s ours am skip reason: Merged-In Id85e2f80b64a9789407f55e86530548f83743f25 with SHA-1 0a2261d46f is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/ktlint/+/24182593 Change-Id: Ibb68b6d1cc05a00623c6a31887cd312062f5d888 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: 5d70a692ea -s ours ↵Xin Li
am: 0b464330dd -s ours am skip reason: Merged-In Id85e2f80b64a9789407f55e86530548f83743f25 with SHA-1 0a2261d46f is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/ktlint/+/24182593 Change-Id: If1ead98fc12fbf4a83c6125765fc386b2aa2532e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28[automerger skipped] Merge Android U (ab/10368041) am: 5d70a692ea -s oursXin Li
am skip reason: Merged-In Id85e2f80b64a9789407f55e86530548f83743f25 with SHA-1 0a2261d46f is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/ktlint/+/24182593 Change-Id: I76efb7925d85b7f5cc1e61ea47b9cb5512dbfe4c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-23Disable the comment-wrapping rule when ktlint should not check formatJordan Demeulenaere
Test: Manual Change-Id: Ic20094e565dca7107b26ae6618a5221e9dcb34f0
2023-08-23Format ktlint.pyJordan Demeulenaere
This CL formats the ktlint.py script using the following command line: $ pyformat --in_place ktlint.py Test: Manual Change-Id: I5d3a74c663f4891360fc037c0bdf611d8ccf6b6f
2023-08-14Merge Android U (ab/10368041)tmp_amf_298295554Xin Li
Bug: 291102124 Merged-In: Id85e2f80b64a9789407f55e86530548f83743f25 Change-Id: I2020d065db2eacb30304f8d6640cae7b33e2e24f
2023-08-11Disable annotation rules in ktlintNataniel Borges
They require wrapping and are not compatible with ktfmt Bug: 290778078 Test: N/A Change-Id: I954c1ab5dfc992aaf892b2d59dfd381a554af707
2023-07-28ktlint: update ktlint to 0.50.0Yifei Zhang
- Built from ab/P60460136 (manually triggered due to expired branch) - Remove --android because the option is removed from ktlint 0.50.0 - Add additional disabled rules due to disabled wrapping rule - Replicate aosp/2506636 Test: ktlint Bug: 290778078 Change-Id: I74ef2fefbe1fa9bfd4fc2e730c6c3ae160634575
2023-03-15Merge "[automerger skipped] Merge Android 13 QPR2 am: 8ff596280c -s ours am: ↵Automerger Merge Worker
4434eae0a3 -s ours am: 8bf8bc37e5 -s ours am: 0a2261d46f -s ours am: 13e52e6733 -s ours"
2023-03-15[automerger skipped] Merge Android 13 QPR2 am: 8ff596280c -s ours am: ↵Xin Li
4434eae0a3 -s ours am: 8bf8bc37e5 -s ours am: 0a2261d46f -s ours am: 13e52e6733 -s ours am skip reason: Merged-In I324bcaf4e9e2b087201810343471a55f2434339f with SHA-1 aa768f01db is already in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/ktlint/+/2487124 Change-Id: Id9b195c52c1ce56bf28a23b3920ae9267a49fff6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15[automerger skipped] Merge Android 13 QPR2 am: 8ff596280c -s ours am: ↵Xin Li
4434eae0a3 -s ours am: 8bf8bc37e5 -s ours am: 0a2261d46f -s ours am: 504c441746 -s ours am skip reason: Merged-In I324bcaf4e9e2b087201810343471a55f2434339f with SHA-1 aa768f01db is already in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/ktlint/+/2487124 Change-Id: I65754e39e47c2252caf7329fb39d6c9a2f087db3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15[automerger skipped] Merge Android 13 QPR2 am: 8ff596280c -s ours am: ↵android-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16android14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-releaseXin Li
4434eae0a3 -s ours am: 8bf8bc37e5 -s ours am: 0a2261d46f -s ours am skip reason: Merged-In I324bcaf4e9e2b087201810343471a55f2434339f with SHA-1 aa768f01db is already in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/ktlint/+/2487124 Change-Id: I58555d4c0ad808165a068092bcdd6b07229f8789 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15[automerger skipped] Merge Android 13 QPR2 am: 8ff596280c -s ours am: ↵Xin Li
4434eae0a3 -s ours am: 8bf8bc37e5 -s ours am: 0a2261d46f -s ours am skip reason: Merged-In I324bcaf4e9e2b087201810343471a55f2434339f with SHA-1 aa768f01db is already in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/ktlint/+/2487124 Change-Id: I8821ad55f04bcc1e95ef37d2ec6137428a44b935 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15[automerger skipped] Merge Android 13 QPR2 am: 8ff596280c -s ours am: ↵android14-devXin Li
4434eae0a3 -s ours am: 8bf8bc37e5 -s ours am skip reason: Merged-In I324bcaf4e9e2b087201810343471a55f2434339f with SHA-1 aa768f01db is already in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/ktlint/+/2487124 Change-Id: Id85e2f80b64a9789407f55e86530548f83743f25 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14[automerger skipped] Merge Android 13 QPR2 am: 8ff596280c -s ours am: ↵ub-automotive-master-20230622Xin Li
4434eae0a3 -s ours am skip reason: Merged-In I324bcaf4e9e2b087201810343471a55f2434339f with SHA-1 aa768f01db is already in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/ktlint/+/2487124 Change-Id: I38d51738b6d32f40a8dfa04c12c05254d59d607d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14[automerger skipped] Merge Android 13 QPR2 am: 8ff596280c -s oursXin Li
am skip reason: Merged-In I324bcaf4e9e2b087201810343471a55f2434339f with SHA-1 aa768f01db is already in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/ktlint/+/2487124 Change-Id: Ie16ab2167082bd28d05f9163f8702bfb911a15b2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-13Merge Android 13 QPR2ub-automotive-master-20230427android-u-beta-1-gplXin Li
Bug: 273316506 Merged-In: I324bcaf4e9e2b087201810343471a55f2434339f Change-Id: I0c8c3ac0a14857601ad10bb17011e62bae2d3c82
2023-01-19Merge "Allow custom editorconfig if needed"Simon Wingrove
2023-01-19Merge "Prevent java.util.* wildcards from being supported"Simon Wingrove
2023-01-13[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: ↵Xin Li
f28ac20316 -s ours am: d7667cdb57 -s ours am skip reason: Merged-In I324bcaf4e9e2b087201810343471a55f2434339f with SHA-1 aa768f01db is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/ktlint/+/20956678 Change-Id: I0c701c017738c8cbffa07fd70b5a68b8edff487b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-13[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: ↵Xin Li
f28ac20316 -s ours am skip reason: Merged-In I324bcaf4e9e2b087201810343471a55f2434339f with SHA-1 aa768f01db is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/ktlint/+/20956678 Change-Id: I2097ec1afda8f2d753975620a0375e9f0a7bb403 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-11Merge tm-qpr-dev-plus-aosp-without-vendor@9467136temp_273316506_tm-qpr2Xin Li
Bug: 264720040 Merged-In: I324bcaf4e9e2b087201810343471a55f2434339f Change-Id: I7c121aab35919e9c82b23b95cd283f488d6b390d
2022-12-20Prevent java.util.* wildcards from being supportedSimon Wingrove
Reduces set of allowable usescases for wildcare import from 2 to 1. This matches Google style, and usual code review comments. This does not count as a formatting check, so import checks apply even in --no-verify-format cases. ktfmt does not have equivalent behavior AFAIK. Test: manually Bug: 261139484 Change-Id: I9e02d4b8426a66a743ad8a160190ea59a15be522
2022-12-20Allow custom editorconfig if neededSimon Wingrove
Allows preupload config to customize the editorconfig, or remove it in favor of directoy-specific ones, if desired. Test: manually Bug: 261139484 Change-Id: Ia4dbbf7dee4f96e5dcfd496cc79e73ae66f661f5
2022-12-12Merge "[automerger skipped] Merge Android 13 QPR1 am: 2ace708d3b -s ours" ↵Automerger Merge Worker
into stage-aosp-master am: fe0af5577c -s ours am: 518d4b1be2 -s ours am skip reason: Merged-In Iaf21df8e85943229c1d832b186825b41cf231b2d with SHA-1 4149cdeb01 is already in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/ktlint/+/2338249 Change-Id: Id9c41d3cd36e808bc4aa7efa264a89443bbb8664 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-12[automerger skipped] Merge Android 13 QPR1 am: 2ace708d3b -s ours am: ↵Xin Li
c85c9a6626 -s ours am: a3979899a9 -s ours am skip reason: Merged-In Iaf21df8e85943229c1d832b186825b41cf231b2d with SHA-1 4149cdeb01 is already in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/ktlint/+/2338249 Change-Id: Ib8a6ee9a958a8aa0e9cf323ef12197b1b158fb47 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-12[automerger skipped] Merge Android 13 QPR1 am: 2ace708d3b -s ours am: ↵Xin Li
bb20efb357 -s ours am: 2a2fc55ba4 -s ours am skip reason: Merged-In Iaf21df8e85943229c1d832b186825b41cf231b2d with SHA-1 4149cdeb01 is already in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/ktlint/+/2338249 Change-Id: Ie0e49abdedc5c56890935944d83d5bb755a7d2ba Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10Merge "[automerger skipped] Merge Android 13 QPR1 am: 2ace708d3b -s ours" ↵Automerger Merge Worker
into stage-aosp-master am: fe0af5577c -s ours am skip reason: Merged-In Iaf21df8e85943229c1d832b186825b41cf231b2d with SHA-1 4149cdeb01 is already in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/ktlint/+/2338249 Change-Id: I027f3b4582f474a2644382d21851cd26a2d84975 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10[automerger skipped] Merge Android 13 QPR1 am: 2ace708d3b -s ours am: ↵Xin Li
c85c9a6626 -s ours am skip reason: Merged-In Iaf21df8e85943229c1d832b186825b41cf231b2d with SHA-1 4149cdeb01 is already in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/ktlint/+/2338249 Change-Id: Ia6f0313899950d0a3a1c30ab94e49c90c284a5ff Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10[automerger skipped] Merge Android 13 QPR1 am: 2ace708d3b -s ours am: ↵Xin Li
bb20efb357 -s ours am skip reason: Merged-In Iaf21df8e85943229c1d832b186825b41cf231b2d with SHA-1 4149cdeb01 is already in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/ktlint/+/2338249 Change-Id: Ib92a5853199b984e9646fbeeb8f43cce59ad8fb7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09Merge "[automerger skipped] Merge Android 13 QPR1 am: 2ace708d3b -s ours" ↵Automerger Merge Worker
into stage-aosp-master
2022-12-09[automerger skipped] Merge Android 13 QPR1 am: 2ace708d3b -s oursXin Li
am skip reason: Merged-In Iaf21df8e85943229c1d832b186825b41cf231b2d with SHA-1 4149cdeb01 is already in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/ktlint/+/2338249 Change-Id: Id17c9bd571d6ad6ef4bc352f832395db7c7eae09 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09[automerger skipped] Merge Android 13 QPR1 am: 2ace708d3b -s oursXin Li
am skip reason: Merged-In Iaf21df8e85943229c1d832b186825b41cf231b2d with SHA-1 4149cdeb01 is already in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/ktlint/+/2338249 Change-Id: I5afeff68b761d33dc1871affd3d597ba412d57c5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09Merge Android 13 QPR1ub-automotive-master-20230303ub-automotive-master-20221215main-16k-with-phonesXin Li
Bug: 261731544 Merged-In: Iaf21df8e85943229c1d832b186825b41cf231b2d Change-Id: Iac9c866a297918b5d4960c577d22e7892c06a415
2022-10-11[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9129937 am: ↵Xin Li
00e265c5a0 -s ours am: 5eba9f57b3 -s ours am skip reason: Merged-In Ia4317fe445c6705dbf24bdc57a7f4a88f7ebc0f5 with SHA-1 bfc4cbe959 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/ktlint/+/20136929 Change-Id: I395505e679a9286b67edb2b12c7bf7f528e2a37e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-11[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9129937 am: ↵Xin Li
00e265c5a0 -s ours am skip reason: Merged-In Ia4317fe445c6705dbf24bdc57a7f4a88f7ebc0f5 with SHA-1 bfc4cbe959 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/ktlint/+/20136929 Change-Id: Ibf1a5874ec63087758582b6fff7bd10dedf08af4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-06Merge tm-qpr-dev-plus-aosp-without-vendor@9129937Xin Li
Bug: 248070379 Merged-In: Ia4317fe445c6705dbf24bdc57a7f4a88f7ebc0f5 Change-Id: I19cd990290c674951c2bfd2e3042cdfe344c5ab0
2022-10-06Allow preupload hooks to ignore more formatting ktlint rules am: aa768f01db ↵Jordan Demeulenaere
am: 3f02d12653 Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/ktlint/+/20120322 Change-Id: Id40c7a4fd5aab6c5d753150a2d3e3d3d6e2e7ff5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-06Allow preupload hooks to ignore more formatting ktlint rules am: aa768f01dbJordan Demeulenaere
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/ktlint/+/20120322 Change-Id: Iaeb01431e0a3e92e98a48e2b5af3e1a686529a4e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-24 14:25:55 +0000