summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-05-14Snap for 7360053 from a68e3f5c482f09d2db7c97ffe754d2b80c80fa37 to sc-release ↵android12-gsiandroid-build-team Robot
am: 54a470641a Original change: https://googleplex-android-review.googlesource.com/c/platform/external/kotlinc/+/14539326 Change-Id: Id110d80b3b6e05a8a69c43166139f73153f4f607
2021-05-14Snap for 7360053 from a68e3f5c482f09d2db7c97ffe754d2b80c80fa37 to sc-releaseandroid-vts-12.0_r9android-vts-12.0_r8android-vts-12.0_r7android-vts-12.0_r6android-vts-12.0_r5android-vts-12.0_r4android-vts-12.0_r3android-vts-12.0_r2android-vts-12.0_r12android-vts-12.0_r11android-vts-12.0_r10android-vts-12.0_r1android-security-12.0.0_r60android-security-12.0.0_r59android-security-12.0.0_r58android-security-12.0.0_r57android-security-12.0.0_r56android-security-12.0.0_r55android-security-12.0.0_r54android-security-12.0.0_r53android-security-12.0.0_r52android-security-12.0.0_r51android-security-12.0.0_r50android-security-12.0.0_r49android-security-12.0.0_r48android-security-12.0.0_r47android-security-12.0.0_r46android-security-12.0.0_r45android-security-12.0.0_r44android-security-12.0.0_r43android-security-12.0.0_r42android-security-12.0.0_r41android-security-12.0.0_r40android-security-12.0.0_r39android-security-12.0.0_r38android-security-12.0.0_r37android-security-12.0.0_r36android-security-12.0.0_r35android-security-12.0.0_r34android-platform-12.0.0_r9android-platform-12.0.0_r8android-platform-12.0.0_r7android-platform-12.0.0_r6android-platform-12.0.0_r5android-platform-12.0.0_r4android-platform-12.0.0_r32android-platform-12.0.0_r31android-platform-12.0.0_r30android-platform-12.0.0_r3android-platform-12.0.0_r29android-platform-12.0.0_r28android-platform-12.0.0_r27android-platform-12.0.0_r26android-platform-12.0.0_r25android-platform-12.0.0_r24android-platform-12.0.0_r23android-platform-12.0.0_r22android-platform-12.0.0_r21android-platform-12.0.0_r20android-platform-12.0.0_r2android-platform-12.0.0_r19android-platform-12.0.0_r18android-platform-12.0.0_r17android-platform-12.0.0_r16android-platform-12.0.0_r15android-platform-12.0.0_r14android-platform-12.0.0_r13android-platform-12.0.0_r12android-platform-12.0.0_r11android-platform-12.0.0_r10android-platform-12.0.0_r1android-cts-12.0_r9android-cts-12.0_r8android-cts-12.0_r7android-cts-12.0_r6android-cts-12.0_r5android-cts-12.0_r4android-cts-12.0_r3android-cts-12.0_r2android-cts-12.0_r12android-cts-12.0_r11android-cts-12.0_r10android-cts-12.0_r1android-12.0.0_r9android-12.0.0_r8android-12.0.0_r34android-12.0.0_r33android-12.0.0_r31android-12.0.0_r30android-12.0.0_r3android-12.0.0_r25android-12.0.0_r2android-12.0.0_r11android-12.0.0_r10android-12.0.0_r1android12-tests-releaseandroid12-security-releaseandroid12-s5-releaseandroid12-s4-releaseandroid12-s3-releaseandroid12-s2-releaseandroid12-s1-releaseandroid12-releaseandroid12-platform-releaseandroid-build-team Robot
Change-Id: I92180482790bbba2111a1a699dc88f9850283cd0
2021-05-13Merge cherrypicks of [14533582, 14533583, 14533584, 14532518, 14533467, ↵android-build-team Robot
14533175, 14533176, 14532519, 14532994, 14531891, 14533231, 14533662, 14531555] into sc-release am: a7e31a2457 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/kotlinc/+/14533468 Change-Id: Icc6e93a470553dc5220f56d853b72442a213f02f
2021-05-13Merge cherrypicks of [14533582, 14533583, 14533584, 14532518, 14533467, ↵android-build-team Robot
14533175, 14533176, 14532519, 14532994, 14531891, 14533231, 14533662, 14531555] into sc-release Change-Id: I8ad34d258f20ee45070df4682d3f37a0659f816a
2021-05-13Revert "Upgrade to kotlinc v1.5.0"Aurimas Liutikas
This reverts commit 74359acd4d05aaf956d92677d2c9725e2a4d59a9. Reason for revert: b/187908823 Change-Id: Ic858ac6b4ad4f47565ca0b59fe6a49b8fc2e8b3d (cherry picked from commit 4d583b8478d648f929ca4b7483e3c099534c8117)
2021-05-13Snap for 7357013 from 08a6e68c3610c58fd94796897ee421aa7821d9c6 to sc-release ↵android-build-team Robot
am: c562b4d061 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/kotlinc/+/14524127 Change-Id: Ic05397c5d39c2ecbc9705ba36b922c7247e70246
2021-05-13Snap for 7357013 from 08a6e68c3610c58fd94796897ee421aa7821d9c6 to sc-releaseandroid-build-team Robot
Change-Id: I75c999da30dc8ecb8a8aebe4350ef0accf793021
2021-05-12Revert "Upgrade to kotlinc v1.5.0" am: 4d583b8478 am: 3ee194938f am: 5846cd11ceandroid-s-qpr3-beta-1android-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_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid-s-qpr3-beta-1Aurimas Liutikas
Original change: https://android-review.googlesource.com/c/platform/external/kotlinc/+/1705748 Change-Id: I88ba3a84337fb2bcecf58369d2c3bac5153d58b4
2021-05-12Revert "Upgrade to kotlinc v1.5.0" am: 4d583b8478 am: 3ee194938fAurimas Liutikas
Original change: https://android-review.googlesource.com/c/platform/external/kotlinc/+/1705748 Change-Id: I3a9e1703d986a384a0339dc9a9510330bff58e1c
2021-05-12Merge cherrypicks of [14522222, 14522223, 14522225, 14522168, 14522184, ↵android-build-team Robot
14522130, 14522131, 14522204, 14522170, 14522150, 14522303, 14522305] into sc-release am: a8e16cb568 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/kotlinc/+/14522185 Change-Id: I6640bd578a45af9a0332e0bcf02bc63ca14340e3
2021-05-12Merge cherrypicks of [14522222, 14522223, 14522225, 14522168, 14522184, ↵android-build-team Robot
14522130, 14522131, 14522204, 14522170, 14522150, 14522303, 14522305] into sc-release Change-Id: I82672c443f150efd4ab59817be220f1a7518635b
2021-05-12Revert "Upgrade to kotlinc v1.5.0"Aurimas Liutikas
This reverts commit 74359acd4d05aaf956d92677d2c9725e2a4d59a9. Reason for revert: b/187908823 Change-Id: Ic858ac6b4ad4f47565ca0b59fe6a49b8fc2e8b3d (cherry picked from commit 4d583b8478d648f929ca4b7483e3c099534c8117)
2021-05-12Revert "Upgrade to kotlinc v1.5.0" am: 4d583b8478Aurimas Liutikas
Original change: https://android-review.googlesource.com/c/platform/external/kotlinc/+/1705748 Change-Id: I0db4d4d65d9cd6c5fc4f6bbb9c8f7d3bf5f0207c
2021-05-12Revert "Upgrade to kotlinc v1.5.0"android-s-beta-1Aurimas Liutikas
This reverts commit 74359acd4d05aaf956d92677d2c9725e2a4d59a9. Reason for revert: b/187908823 Change-Id: Ic858ac6b4ad4f47565ca0b59fe6a49b8fc2e8b3d
2021-05-12Snap for 7354453 from 08a6e68c3610c58fd94796897ee421aa7821d9c6 to sc-release ↵android-build-team Robot
am: 0e6aea4293 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/kotlinc/+/14508085 Change-Id: I8e9ea5e09cf58d2736ab7dfffa7be6bdaadbda48
2021-05-12Snap for 7354453 from 08a6e68c3610c58fd94796897ee421aa7821d9c6 to sc-releaseandroid-build-team Robot
Change-Id: Ic66da6f611535872980f669bdbffd26fe4e12295
2021-05-11Upgrade to kotlinc v1.5.0 am: 74359acd4d am: 0483ca6709 am: ab7a24955dAurimas Liutikas
Original change: https://android-review.googlesource.com/c/platform/external/kotlinc/+/1697785 Change-Id: Ibf30aeed662b5599ac8d776cdeecb34726061e9c
2021-05-11Upgrade to kotlinc v1.5.0 am: 74359acd4d am: 0483ca6709Aurimas Liutikas
Original change: https://android-review.googlesource.com/c/platform/external/kotlinc/+/1697785 Change-Id: I0e08542a9c82702c070a9e5815da0b3db53c19c9
2021-05-11Upgrade to kotlinc v1.5.0 am: 74359acd4dAurimas Liutikas
Original change: https://android-review.googlesource.com/c/platform/external/kotlinc/+/1697785 Change-Id: I3337fd235155624e8de5686c5465568f029d4bc0
2021-05-05Upgrade to kotlinc v1.5.0Aurimas Liutikas
Test: make Change-Id: I091e7030682fb6656edd2c43a64a068bda066472
2021-02-21Snap for 7160059 from 843952022eb6ecca4b8594766186d0e2707e0922 to sc-release ↵android-build-team Robot
am: a0d089866e Original change: https://googleplex-android-review.googlesource.com/c/platform/external/kotlinc/+/13645682 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3b5d35630ad30fd2e42cfb8b06e392ccea7c74ce
2021-02-21Snap for 7160059 from 843952022eb6ecca4b8594766186d0e2707e0922 to sc-releaseandroid-build-team Robot
Change-Id: Ifdea72ad94ce4948ac36381c7e36d89d0e684a4f
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 16a27a9391 -s ↵Xin Li
ours am: 2a9ce7eb7a -s ours am skip reason: Change-Id Ic3d10111dec61600f6ee7c691a7e7be3985776a3 with SHA-1 cc351dda40 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I00cdf6913b7b1736f5381eb5eb3bccbceee1cc6a
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 16a27a9391 -s oursXin Li
am skip reason: Change-Id Ic3d10111dec61600f6ee7c691a7e7be3985776a3 with SHA-1 cc351dda40 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I162c7050ab0d72d9df99aaeb5cf4be4fc6a6e9c2
2021-02-20Mark ab/7061308 as merged in stage.Xin Li
Bug: 180401296 Merged-In: Ic3d10111dec61600f6ee7c691a7e7be3985776a3 Change-Id: I3cef99225881cd260bdaa2431269e89fb04a1f22
2021-02-20Snap for 7158291 from ffc43ed54a138cca05e7a30112e4e6d5334f0072 to sc-release ↵android-build-team Robot
am: 34bef0b53a Original change: https://googleplex-android-review.googlesource.com/c/platform/external/kotlinc/+/13635554 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia553460b42d62572950dfe791284b7bde1b374a2
2021-02-20Snap for 7158291 from ffc43ed54a138cca05e7a30112e4e6d5334f0072 to sc-releaseandroid-build-team Robot
Change-Id: I992a77505fb83f3ffe7b1101ccaea60764070bf9
2021-02-19Upgrade kotlinc to v1.4.30 am: 610ce4e685 am: b08245c672 am: cc6b0c1d0bAurimas Liutikas
Original change: https://android-review.googlesource.com/c/platform/external/kotlinc/+/1592918 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I731ca785cb8e0083519133cdd373da7fb946cf9d
2021-02-19Upgrade kotlinc to v1.4.30 am: 610ce4e685 am: b08245c672Aurimas Liutikas
Original change: https://android-review.googlesource.com/c/platform/external/kotlinc/+/1592918 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I78802886da7a8301c8bc973d9767665f6fa53cbe
2021-02-19Upgrade kotlinc to v1.4.30 am: 610ce4e685Aurimas Liutikas
Original change: https://android-review.googlesource.com/c/platform/external/kotlinc/+/1592918 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I66840b1fc5c26998aaf24c59241accf2f72d52c4
2021-02-17Upgrade kotlinc to v1.4.30Aurimas Liutikas
Test: make Change-Id: Iae3c1d56b09142ea9a7d155be08e9edd2048dc50
2021-02-17Snap for 7149879 from afb5cd70d01379e3f1b0fe38d6caaeff5b491490 to sc-release ↵android-build-team Robot
am: bcc1e87e33 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/kotlinc/+/13593870 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I49d6dec726612ce6205dc33ebb25f01418cc2fa7
2021-02-17Snap for 7149879 from afb5cd70d01379e3f1b0fe38d6caaeff5b491490 to sc-releaseandroid-build-team Robot
Change-Id: Ic842676232b02c098b4308a4adcdb12b5b00deb2
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/kotlinc am: 816a21ed45 am: ↵Bob Badour
ea6bb32672 am: 06bf5c80f5 Original change: https://android-review.googlesource.com/c/platform/external/kotlinc/+/1588704 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I50d95e8a937b4f3c93b5910d1e3f3539c37d8fea
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/kotlinc am: 816a21ed45 am: ea6bb32672Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/kotlinc/+/1588704 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie1f9990cdd24ac3f7b54409d461bbb1493d1aad8
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/kotlinc am: 816a21ed45Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/kotlinc/+/1588704 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2175953f36a3ef344d1db31b9d4e298dfe2da4f2
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/kotlincBob Badour
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD SPDX-license-identifier-BSL-1.0 SPDX-license-identifier-CC0-1.0 SPDX-license-identifier-EPL SPDX-license-identifier-GPL SPDX-license-identifier-GPL-2.0 SPDX-license-identifier-ISC SPDX-license-identifier-JSON SPDX-license-identifier-LGPL SPDX-license-identifier-LGPL-2.1 SPDX-license-identifier-LGPL-3.0 SPDX-license-identifier-MIT SPDX-license-identifier-MPL SPDX-license-identifier-MPL-1.0 legacy_notice legacy_restricted to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Iff0987fbf025168d4cf3f96fa48144ab096f0872
2021-01-25Snap for 7100215 from a0f5302682fcb4bf3083b6ba2fdb0dc12b5ed520 to sc-release ↵android-build-team Robot
am: 321bf59f36 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/kotlinc/+/13398614 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ica3b9d36173ed48365ab35cd0f889698472aa47b
2021-01-25Snap for 7100215 from a0f5302682fcb4bf3083b6ba2fdb0dc12b5ed520 to sc-releaseandroid-build-team Robot
Change-Id: I688ea6607250549f88ae2876faa4ad5194024022
2021-01-24Fix license_type. Contains LGPL am: 76ce61d4c5 am: ff1164e0a6 am: 8138c72e3bBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/kotlinc/+/1556488 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I408d81102c59bee336606bd673f4c2a309b6d748
2021-01-24Fix license_type. Contains LGPL am: 76ce61d4c5 am: ff1164e0a6Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/kotlinc/+/1556488 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie90f4599a7cb8ee859ac24a51298319fab15d360
2021-01-23Fix license_type. Contains LGPL am: 76ce61d4c5Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/kotlinc/+/1556488 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I814839ceaaa3b5ed47706a84ae038305565bd5f3
2021-01-21Fix license_type. Contains LGPLBob Badour
In trove and possibly elsewhere. See: http://go/android-license-checking-v2-lsc Test: m all Bug: 151953481 Bug: 151177513 Bug: 67772237 Change-Id: I878d5f88090e0b9be8881d1f77ce97121e9a4082
2020-12-05Snap for 7013096 from 3f80514eae53d7cf02d8ceade89fb5ffb69c7356 to sc-releaseandroid-s-preview-1s-preview-1android-build-team Robot
Change-Id: I002413e089c863b2373543dbe07037d93656a4ab
2020-12-04[automerger skipped] Use Apache license for jars am: 4f32aae332 -s oursColin Cross
am skip reason: Change-Id Ibf0c549571c2b4ea68243a1e6e185a1dbc9f2325 with SHA-1 071a2ac80c is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/kotlinc/+/13163838 Change-Id: Idfb76cfb9d51aafc2400be38c1d5f5013ec35f3b
2020-12-04Snap for 7010663 from 3783df8900f63f89a38b33f6af786ada7139977a to sc-releaseandroid-build-team Robot
Change-Id: I031041675f6aab40cec95d09e68c0d13938008cf
2020-12-04Update Kotlin compiler to custom 1.4.20 with IR fixes. am: 64ab879540 am: ↵Mads Ager
ba555b31fa am: cc351dda40 Original change: https://android-review.googlesource.com/c/platform/external/kotlinc/+/1512507 Change-Id: Ib9ac677c15a68b68f9d9cc409e94eb2a852157fa
2020-12-04Update Kotlin compiler to custom 1.4.20 with IR fixes. am: 64ab879540 am: ↵Mads Ager
ba555b31fa Original change: https://android-review.googlesource.com/c/platform/external/kotlinc/+/1512507 Change-Id: Ic3d10111dec61600f6ee7c691a7e7be3985776a3
2020-12-04Update Kotlin compiler to custom 1.4.20 with IR fixes. am: 64ab879540Mads Ager
Original change: https://android-review.googlesource.com/c/platform/external/kotlinc/+/1512507 Change-Id: I051d0398849b60d58a66881ef829341aa4208359
2020-12-03Use Apache license for jarsandroid-mainline-11.0.0_r44android-mainline-11.0.0_r23android-mainline-11.0.0_r15android11-mainline-os-statsd-releaseandroid11-mainline-extservices-releaseColin Cross
The individual jars exported as Soong modules are covered by the Apache license in license/NOTICE.txt, not by the combined licenses in the LICENSE file. See license/README.md for explanation why this is correct. Bug: 174167893 Test: manual Change-Id: Ibf0c549571c2b4ea68243a1e6e185a1dbc9f2325 Merged-In: Ibf0c549571c2b4ea68243a1e6e185a1dbc9f2325 (cherry picked from commit 071a2ac80cf4d269856bd1ddde6d4432852b5d91)
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-19 15:38:29 +0000