summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-05-13Snap for 7358968 from 3f86a6c9deae72028f8276d9d489ecf308864275 to sc-d2-releaseandroid-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid-build-team Robot
Change-Id: Ia7163edf66b6d13504241a00c7f083e193af053d
2021-05-12Revert "Upgrade to kotlinc v1.5.0" am: 4d583b8478 am: 3ee194938f am: ↵Aurimas Liutikas
5846cd11ce am: a68e3f5c48 Original change: https://android-review.googlesource.com/c/platform/external/kotlinc/+/1705748 Change-Id: Ifc09036296bc8142d4a0d149f3d235dabbc87589
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-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-11Upgrade to kotlinc v1.5.0 am: 74359acd4d am: 0483ca6709 am: ab7a24955d am: ↵Aurimas Liutikas
08a6e68c36 Original change: https://android-review.googlesource.com/c/platform/external/kotlinc/+/1697785 Change-Id: I16efba60bed41d8731eeec2326b29020ef032f92
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-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-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-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-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-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-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)
2020-12-03Update Kotlin compiler to custom 1.4.20 with IR fixes.Mads Ager
This is built from the 1.4.20 sources with minor patches that only affect the compiler with using the -Xuse-ir flag to use the new IR-based backend. Build from https://github.com/google/kotlin/tree/google-ir Build by builder: https://ci.chromium.org/p/r8/builders/ci/kotlin-builder Test: make Test: atest com.android.systemui Change-Id: I5efb91ce9b19315b8239f372d01198a554b84d19
2020-12-03Use Apache license for jars am: 071a2ac80c am: 0fcd78ec90 am: ea9eab8da9Colin Cross
Original change: https://android-review.googlesource.com/c/platform/external/kotlinc/+/1512506 Change-Id: Id2aaf88658c222f39e2ab5fcf4c2be3f8c9e3668
2020-12-03Use Apache license for jars am: 071a2ac80c am: 0fcd78ec90Colin Cross
Original change: https://android-review.googlesource.com/c/platform/external/kotlinc/+/1512506 Change-Id: Ie375e2b39d3237d161b95e92f9f9d9b3505a715e
2020-12-03Use Apache license for jars am: 071a2ac80cColin Cross
Original change: https://android-review.googlesource.com/c/platform/external/kotlinc/+/1512506 Change-Id: I58e4a04cd68888f0d87c47f9d3023c78a958e7cb
2020-12-03Use Apache license for jarsColin 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
2020-11-24Merge "Mark ab/6881855 as merged" into stage-aosp-master am: 36738a119c am: ↵TreeHugger Robot
0343ccf72e Original change: https://googleplex-android-review.googlesource.com/c/platform/external/kotlinc/+/13110684 Change-Id: Ibf808e91026e8bcd7007df2e933a51630c90f83a
2020-11-24Merge "Mark ab/6881855 as merged" into stage-aosp-master am: 36738a119cTreeHugger Robot
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/kotlinc/+/13110684 Change-Id: If9159587e21e1374122e633005ebd89c4ce2ffbf
2020-11-24Merge "Mark ab/6881855 as merged" into stage-aosp-masterTreeHugger Robot
2020-11-23Upgrade kotlinc to v1.4.20 am: 66706209b0 am: 487dccdafa am: 1011edf397Haibo Huang
Original change: https://android-review.googlesource.com/c/platform/external/kotlinc/+/1505014 Change-Id: I29370d33445f5da5b59159dfa336aadfd351287c
2020-11-23Upgrade kotlinc to v1.4.20 am: 66706209b0 am: 487dccdafaHaibo Huang
Original change: https://android-review.googlesource.com/c/platform/external/kotlinc/+/1505014 Change-Id: Ibbde1765334c08fe2856a0aefdbfa445640700dc
2020-11-23Upgrade kotlinc to v1.4.20 am: 66706209b0Haibo Huang
Original change: https://android-review.googlesource.com/c/platform/external/kotlinc/+/1505014 Change-Id: I02dcd5bfb84b33725cd0ef35aa9b007f9ab09408
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I545b001e94818e996ca7a16ed0c28a9b613ed3ed
2020-11-19Upgrade kotlinc to v1.4.20Haibo Huang
Test: make Change-Id: I0f574a530182f7b89b0070b70c87cc5803ab1ecc
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 549e50fe37 -s ours am: ↵Xin Li
a99bf0ee30 -s ours am: 674a934e2d -s ours am skip reason: Change-Id Ib452d251f6141fb7a182a8d3646b43d5d147a234 with SHA-1 ca978263af is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/kotlinc/+/12797134 Change-Id: I0151a0c76e61be643772b8fe0e633be2851daf8d
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 549e50fe37 -s ours am: ↵Xin Li
a99bf0ee30 -s ours am skip reason: Change-Id Ib452d251f6141fb7a182a8d3646b43d5d147a234 with SHA-1 ca978263af is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/kotlinc/+/12797134 Change-Id: I064704f3b0e4969f58bb8b1deac8fddfa2abe050
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 549e50fe37 -s oursXin Li
am skip reason: Change-Id Ib452d251f6141fb7a182a8d3646b43d5d147a234 with SHA-1 ca978263af is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/kotlinc/+/12797134 Change-Id: Ib5ddbdf5686e11622185815119c6c911cb6b00f8
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: Ib452d251f6141fb7a182a8d3646b43d5d147a234 Change-Id: I443556bd4ac38302e22249152f23b6b9d1a61bb2
2020-09-11Upgrade kotlinc to v1.4.10 am: a8149698b9 am: 6f805a9f41 am: 5ab0e883ae am: ↵Haibo Huang
7afc25b996 am: 449953adfd Original change: https://android-review.googlesource.com/c/platform/external/kotlinc/+/1424408 Change-Id: I2969f4a168d8e3354e9a9132555204f4f6afbfbd
2020-09-11Upgrade kotlinc to v1.4.10 am: a8149698b9 am: 6f805a9f41 am: 5ab0e883ae am: ↵Haibo Huang
7afc25b996 Original change: https://android-review.googlesource.com/c/platform/external/kotlinc/+/1424408 Change-Id: Ifc2460f7a3dabb3a1f84e67768cf48f1860678eb
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-15 18:04:18 +0000