aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-17Snap for 7149879 from 2a4cb0ec252bf941a985428a368ca7a81707e7d6 to sc-d1-releaseandroid-12.0.0_r7android-12.0.0_r6android-12.0.0_r5android-12.0.0_r4android-12.0.0_r15android-12.0.0_r14android-12.0.0_r13android-12.0.0_r12android12-d1-s6-releaseandroid12-d1-s5-releaseandroid12-d1-s4-releaseandroid12-d1-s3-releaseandroid12-d1-s2-releaseandroid12-d1-s1-releaseandroid12-d1-releaseandroid-build-team Robot
Change-Id: I0d276b2e342e017aab764fc456089fd2cb859381
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/turbine am: 9b74b95fd8 am: ↵android-mainline-12.0.0_r4android-mainline-12.0.0_r36android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-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_r12android-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-devandroid12L-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-releaseandroid12-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-devandroid12--mainline-releaseBob Badour
b355bf37c4 am: 26dc61dbc5 Original change: https://android-review.googlesource.com/c/platform/external/turbine/+/1588973 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2ae2b467605a990fa9a8f4ccdb738b77f1dcc660
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/turbine am: 9b74b95fd8 am: b355bf37c4Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/turbine/+/1588973 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id5676fa5188c9bf605a8f8c2a03ddf26a708d125
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/turbine am: 9b74b95fd8android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-4Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/turbine/+/1588973 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I144ea1d71d7b0eaf319b4cc04a98972fab9b8889
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/turbineandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-Apache-2.0 to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Ic5f2dc6944fdcaf0ae5b576f3fb327150cfd75b1
2020-06-28Snap for 6635763 from 2edb36b3d3dd7d67a653dd7ff2605e0862a97615 to sc-d1-releaseandroid-build-team Robot
Change-Id: Ie9ab205ed68f447cc59329d96e5e6e455166a703
2020-06-26Use AutoValue from external/auto am: b4330c4fd8 am: 405b0d4716 am: ↵Colin Cross
5b69bfc75c am: a3b31455a4 am: 4a27fd761e am: d7a2f535a8 Original change: https://android-review.googlesource.com/c/platform/external/turbine/+/1344587 Change-Id: I862dc6e8c808dcd6393a2888cc4752ff3c36dc61
2020-06-26Use AutoValue from external/auto am: b4330c4fd8 am: 405b0d4716 am: ↵Colin Cross
5b69bfc75c am: a3b31455a4 am: 4a27fd761e Original change: https://android-review.googlesource.com/c/platform/external/turbine/+/1344587 Change-Id: I0fcfb02aa2046c89e93e980a340e3c44fe9c6c30
2020-06-26Use AutoValue from external/auto am: b4330c4fd8 am: 405b0d4716 am: ↵Colin Cross
5b69bfc75c am: a3b31455a4 Original change: https://android-review.googlesource.com/c/platform/external/turbine/+/1344587 Change-Id: I83d241c8fa047bb40a99c45363ae310edc9346bb
2020-06-26Use AutoValue from external/auto am: b4330c4fd8 am: 405b0d4716 am: 5b69bfc75cColin Cross
Original change: https://android-review.googlesource.com/c/platform/external/turbine/+/1344587 Change-Id: I58722370158b78d1090445960724cc9e09a97847
2020-06-26Use AutoValue from external/auto am: b4330c4fd8 am: 405b0d4716Colin Cross
Original change: https://android-review.googlesource.com/c/platform/external/turbine/+/1344587 Change-Id: Ie1187f72c656fde116899fb47ea0be3cea82a327
2020-06-26Use AutoValue from external/auto am: b4330c4fd8Colin Cross
Original change: https://android-review.googlesource.com/c/platform/external/turbine/+/1344587 Change-Id: Id63527485e021411372f55ee1ab34ce4df0e01d1
2020-06-19Use AutoValue from external/autoandroid-r-beta-3android-r-beta-2Colin Cross
Use the AutoValue built from source instead of the prebuilts from external/dagger2. Also replace the annotations that were being picked up from the prebuilts with local stubs. Bug: 158870037 Test: m checkbuild Change-Id: I37eff2258f343a17cb1fa80ca7f36f80aa9536ff
2020-05-01Snap for 6450316 from a9f740ed36879370c4e47d238942fb05c87b7775 to sc-d1-releaseandroid-build-team Robot
Change-Id: I548ab105473c9af5642d14f40d343520bf7c3cc1
2020-04-30Snap for 6445872 from e4b79b803f8a5a93a0fc3d7b16903136de664c40 to sc-d1-releaseandroid-build-team Robot
Change-Id: Id6397a9cb39fc5da529fd4746c4e056d103ccffb
2020-04-30Expand turbine METADATA am: f8fd54c228 am: 0c812a26fd am: cf949c2abb am: ↵Colin Cross
fadef3a325 am: acf406bbae am: b59c5f4b32 Change-Id: I9eb9cdd1be8d3628dc4a80edb1e6a47e628e5cc0
2020-04-30Expand turbine METADATA am: f8fd54c228 am: 0c812a26fd am: cf949c2abb am: ↵Colin Cross
fadef3a325 am: acf406bbae Change-Id: I4335c339ffbce78849d7d03729a3a7752ab1517f
2020-04-30Expand turbine METADATA am: f8fd54c228 am: 0c812a26fd am: cf949c2abb am: ↵Colin Cross
fadef3a325 Change-Id: I51f752a78812c3c2be3043cc4b680dca6226c032
2020-04-30Expand turbine METADATA am: f8fd54c228 am: 0c812a26fd am: cf949c2abbColin Cross
Change-Id: I309d649924bdf5b002eac3580f0d93cd473b0000
2020-04-30Expand turbine METADATA am: f8fd54c228 am: 0c812a26fdColin Cross
Change-Id: I8b2a8748ad13af0ee07f03a8b348145351a2c550
2020-04-30Expand turbine METADATA am: f8fd54c228Colin Cross
Change-Id: I90d1ca452325796b11c8f60f38b6168243b97ec8
2020-04-29Add METADATA to turbine: Apache2=NOTICE am: bc9968a91c am: 5b54548750 am: ↵Bob Badour
dc25fe2465 am: cee4047461 am: d9be12f038 am: 8f85f34083 Change-Id: I8a6a53b2bb80ef33de4014e9d06aa6a3cd064bb5
2020-04-29Add METADATA to turbine: Apache2=NOTICE am: bc9968a91c am: 5b54548750 am: ↵Bob Badour
dc25fe2465 am: cee4047461 am: d9be12f038 Change-Id: I8e38c2e3e7b1e858621334dd33f2ed15ecd3599b
2020-04-29Add METADATA to turbine: Apache2=NOTICE am: bc9968a91c am: 5b54548750 am: ↵Bob Badour
dc25fe2465 am: cee4047461 Change-Id: I99cd7101fd04c69cccb6b5b33647002f5d20be13
2020-04-29Add METADATA to turbine: Apache2=NOTICE am: bc9968a91c am: 5b54548750 am: ↵Bob Badour
dc25fe2465 Change-Id: I3dde2afda4113d678e696118338012bdd256bd76
2020-04-29Add METADATA to turbine: Apache2=NOTICE am: bc9968a91c am: 5b54548750Bob Badour
Change-Id: Ifbfb8ebe52e07666874207917a882eea4d3324f5
2020-04-29Add METADATA to turbine: Apache2=NOTICE am: bc9968a91cBob Badour
Change-Id: I729f41ea62da9b03f556137fbcfe7c32c75cda12
2020-04-29Expand turbine METADATAColin Cross
Test: none Change-Id: I7910b84f152d2c91b078754f6e9e5254f4a2db94
2020-04-28Add METADATA to turbine: Apache2=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: Ib4beab2d4412580d4e8a671500e2ecb737cdce51
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 1d72f58a77 -s ours am: 2bfc71f04f am: e619ee4b5e am: 709b7dbf0f -s ours am: 4f190d3b60 Change-Id: Iab475dca7b6deaa23854b2d1e18234e8cb0711af
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 1d72f58a77 -s ours am: 2bfc71f04f am: e619ee4b5e am: 709b7dbf0f -s ours am skip reason: subject contains skip directive Change-Id: I1febd7cffdd3b4b7cc212a2eb0722de1fb0cc3f8
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 1d72f58a77 -s ours am: 2bfc71f04f am: e619ee4b5e Change-Id: I0f807e48293d88ce993f7d761f8a66e5de0f8c0a
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 1d72f58a77 -s ours am: 2bfc71f04f Change-Id: I82927b38039066b6fef230e7202821ba46c1fee0
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 1d72f58a77 -s ours am skip reason: subject contains skip directive Change-Id: Ied7e30ce82174653fe5355e98daaf9509d2c8806
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: I02fb38d6b899c1d54cbed3e898966390c1071aca
2020-03-30Merge upstream into AOSP am: b3b9a496c8 am: 0d6829d18a am: 8d3432cae7 am: ↵Adrian Roos
c50aacf851 am: 3fa1bc8dd7 Change-Id: I4741414765e75346318edde0385713bd01155e3a
2020-03-30Merge upstream into AOSP am: b3b9a496c8 am: 0d6829d18a am: 8d3432cae7 am: ↵Adrian Roos
c50aacf851 Change-Id: I3913cdc69df4c0964d12f467533304056d70f93c
2020-03-30Merge upstream into AOSP am: b3b9a496c8 am: 0d6829d18a am: 8d3432cae7Adrian Roos
Change-Id: Ib1e484ed2734d883d40c33b42b66b50df6c8bbbc
2020-03-30Merge upstream into AOSP am: b3b9a496c8 am: 0d6829d18aAdrian Roos
Change-Id: I1e12da2f674663fd498d62d653ceb4735130a082
2020-03-30Merge upstream into AOSP am: b3b9a496c8 am: 0d6829d18aAdrian Roos
Change-Id: Idb8e5f61a97cfe0d851ae89b75439101fc4a377c
2020-03-30Merge upstream into AOSP am: b3b9a496c8Adrian Roos
Change-Id: Ic103c276716a4cbcde8bf4557d482147bf9ec8a0
2020-03-27Merge upstream into AOSPAdrian Roos
Bug: 151160048 Test: make droid Change-Id: I644073ab8c7636850f5fe34fa58d1ba2c3048236
2020-03-26Improve error reporting for constant expressionscushon
including constant field initializers, and annotations. Previously we were crashing e.g. on bogus infix expressions like `"a" + + "b"`. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=303137566
2020-03-26Remove redundant NOTICE copied from LICENSE. am: dbe678bfbe am: 05724bdb61 ↵Bob Badour
am: 70bdbdb467 am: 4cd0421e46 am: 9d4e19f7ef Change-Id: I08cc2c5a4da3026f69c6a4f14fd2041128ba33c9
2020-03-26Remove redundant NOTICE copied from LICENSE. am: dbe678bfbe am: 05724bdb61 ↵Bob Badour
am: 70bdbdb467 am: 4cd0421e46 Change-Id: Iea3d5d5d169bce976bed154cc810120d3427cc84
2020-03-26Remove redundant NOTICE copied from LICENSE. am: dbe678bfbe am: 05724bdb61 ↵Bob Badour
am: 70bdbdb467 Change-Id: I59da2612221b8a6af1fadb22a34e837a950c71df
2020-03-26Remove redundant NOTICE copied from LICENSE. am: dbe678bfbe am: 05724bdb61Bob Badour
Change-Id: Id26b1da465d18053078f809dae9fb53a61f55626
2020-03-26Remove redundant NOTICE copied from LICENSE. am: dbe678bfbe am: 05724bdb61Bob Badour
Change-Id: I1da2c6779a36dd33e3b56257af149b2d172ced21
2020-03-26Remove redundant NOTICE copied from LICENSE. am: dbe678bfbeBob Badour
Change-Id: Ia2c40d6e5bccc778e2b308417edf0bce4098f134
2020-03-25Remove redundant NOTICE copied from LICENSE.Bob Badour
Identified using the below shell script: $ find -H . -name LICENSE -type f -print0 | xargs -0 dirname \ | while read dir; do \ if [ -f "${dir}/NOTICE" ] \ && diff "${dir}/LICENSE" "${dir}/NOTICE" >/dev/null; then \ echo "${dir}/NOTICE"; \ fi; \ done Now that http://r.android.com/r/1235427 and http://r.android.com/r/1238719 are merged, LICENSE files copied into NOTICE files are no longer needed. Bug: 67772237 Bug: 68860345 Test: manually built and diffed before and after system image notices Change-Id: Ic8165df8a33f1f961ebb6102edff42c7d160703e
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-17 00:04:56 +0000