summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/ply am: fc08a3caeeandroid-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/ply/+/1588702 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I827a817d56a98a073205cff42db6faa9a6293efc
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/plyandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-BSD legacy_unencumbered to: Android.bp ply/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Iec9300f0cfe07eca33bcd676ca706824b2ed1060
2021-01-22Fix license_type. BSD is a NOTICE license. am: 10f4c49d40Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/ply/+/1556492 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia2d89965389a983f563ae635f2a4324832c40bb8
2021-01-21Fix license_type. BSD is a NOTICE license.Bob Badour
See: http://go/android-license-checking-v2-lsc Test: m all Bug: 151953481 Bug: 151177513 Bug: 67772237 Change-Id: I3a5b80377ac327f223515b0a856731111396c36f
2020-04-28[automerger skipped] Enable ply an importable module. am: edb5967727 am: ↵Jim Tang
82957451d3 am: 21c343dd3b am: cf630d720b -s ours am skip reason: Change-Id Iafb1c669c16b20eec288bad6d2ea530f0d3ab2a8 with SHA-1 edb5967727 is in history Change-Id: I220817aeb9f777790dc1b3c75daa891baebc019b
2020-04-28Correct license header of ply to AOSP am: 9eb1e198ee am: 36da259d11 am: ↵Dan Shi
8223645d85 am: e830249417 Change-Id: I3e4113d5ddb29eca241cce005d418bffb9540701
2020-04-28[automerger skipped] Enable ply an importable module. am: edb5967727 am: ↵Jim Tang
82957451d3 -s ours am: 9fdd401e0a -s ours am skip reason: Change-Id Iafb1c669c16b20eec288bad6d2ea530f0d3ab2a8 with SHA-1 edb5967727 is in history Change-Id: I3c36d3799d22563bdd5b38dc27796dc2f1d2a166
2020-04-28Enable ply an importable module. am: edb5967727 am: 82957451d3 am: 21c343dd3bJim Tang
Change-Id: If232c4020bad95110bc1401f409808b7e8384cf3
2020-04-28[automerger skipped] Enable ply an importable module. am: edb5967727 -s ours ↵Jim Tang
am: 275f095458 -s ours am: cc5aee9b95 -s ours am skip reason: Change-Id Iafb1c669c16b20eec288bad6d2ea530f0d3ab2a8 with SHA-1 0b5a27fb00 is in history Change-Id: Ia62b8429e54333a0c900b7f65d397a38caf40a0b
2020-04-28Correct license header of ply to AOSP am: 9eb1e198ee am: 36da259d11 am: ↵Dan Shi
8223645d85 Change-Id: I7dcc602d130ed05d6b731e72a7a0ec89e656977b
2020-04-28Enable ply an importable module. am: edb5967727 am: 82957451d3android-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-d2-releaseJim Tang
Change-Id: I9e9825721f94d5b5cd85df924d93a0bc22bf5ddc
2020-04-28[automerger skipped] Enable ply an importable module. am: edb5967727 am: ↵Jim Tang
82957451d3 -s ours am skip reason: Change-Id Iafb1c669c16b20eec288bad6d2ea530f0d3ab2a8 with SHA-1 edb5967727 is in history Change-Id: Ia70572d183ced78801fdf8bb46709d54e3da3d41
2020-04-28[automerger skipped] Enable ply an importable module. am: edb5967727 -s ours ↵Jim Tang
am: 275f095458 -s ours am skip reason: Change-Id Iafb1c669c16b20eec288bad6d2ea530f0d3ab2a8 with SHA-1 0b5a27fb00 is in history Change-Id: I3a2447dccd9757ca2beaca8f651e1894040dd2e3
2020-04-28Correct license header of ply to AOSP am: 9eb1e198ee am: 36da259d11Dan Shi
Change-Id: I2898a5c27b5a16f78c25667ba40ad90c500ac89a
2020-04-28Enable ply an importable module. am: edb5967727android-11.0.0_r16android11-d1-b-releaseJim Tang
Change-Id: Iaaa634f04174ba8aaa3fc382c6dc5796866169ca
2020-04-28[automerger skipped] Enable ply an importable module. am: edb5967727 -s oursJim Tang
am skip reason: Change-Id Iafb1c669c16b20eec288bad6d2ea530f0d3ab2a8 with SHA-1 0b5a27fb00 is in history Change-Id: Ifa95bd6c97d262d6e7733639758fa4ca7c80a6c5
2020-04-28Correct license header of ply to AOSP am: 9eb1e198eeandroid-r-beta-3android-r-beta-2Dan Shi
Change-Id: Ia879823d072246f7ecec16ef6b37cb55d4d7de79
2020-04-28Correct license header of ply to AOSPDan Shi
Bug: 153941871 Test: None Change-Id: Ic48b01d0365bc8443986533746e149b7aa2c8cfc
2020-04-28Enable ply an importable module.android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android11-mainline-tethering-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-devJim Tang
Bug: 153941871 Test: build manually Change-Id: Iafb1c669c16b20eec288bad6d2ea530f0d3ab2a8 Merged-In: Iafb1c669c16b20eec288bad6d2ea530f0d3ab2a8 Merged-In: Ic48b01d0365bc8443986533746e149b7aa2c8cfc
2020-04-20Enable ply an importable module. am: 0b5a27fb00 am: 1f976d8d95 am: ↵Jim Tang
b3c01d6ef3 am: e8a8ca2e3d Change-Id: If49c508554d9520b4239d37000d4cfe5e6a6e393
2020-04-20Enable ply an importable module. am: 0b5a27fb00 am: 1f976d8d95 am: b3c01d6ef3Jim Tang
Change-Id: I90534d5ca13b635117fddf8c1192bd0ee47a37eb
2020-04-20Enable ply an importable module. am: 0b5a27fb00 am: 1f976d8d95Jim Tang
Change-Id: Ie97eec7f513a6fc073018b03cff28586c15b381b
2020-04-20Enable ply an importable module. am: 0b5a27fb00Jim Tang
Change-Id: I1dcf5d0614aa07da36a530f04ee55626f095f3ef
2020-04-15Enable ply an importable module.Jim Tang
Bug: 153941871 Test: build manually Change-Id: Iafb1c669c16b20eec288bad6d2ea530f0d3ab2a8
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: c0e414d5a4 -s ours am: 2c9eb61c91 am: 892f221302 Change-Id: I839bba4212c638338ced5c115ea07dc5004cd690
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: c0e414d5a4 -s ours am: 2c9eb61c91 Change-Id: Ia0d3a85b3ed4740468747c480630f2cec7bccc60
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: c0e414d5a4 -s ours am skip reason: subject contains skip directive Change-Id: I2f94a530e1668d1c71f50eb8b88ec7fe2cf39135
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: Iaae749c1508e212b95c1d461d6e8584c020f0ee0
2020-03-26Remove redundant NOTICE copied from LICENSE. am: fc6a8cb464 am: fa60d37eff ↵Bob Badour
am: 0738e50f90 am: 7483603884 Change-Id: I9baa14ae3746ead0705ae74e4fc46bc18aa9c5d7
2020-03-26Remove redundant NOTICE copied from LICENSE. am: fc6a8cb464 am: fa60d37eff ↵Bob Badour
am: 0738e50f90 Change-Id: I15a0d1dd25bdaa7b75d712dd02d61b926f2002d8
2020-03-26Remove redundant NOTICE copied from LICENSE. am: fc6a8cb464 am: fa60d37effBob Badour
Change-Id: I2de2b04a0cd8fb5f340cc1d14886f4104963e9f6
2020-03-26Remove redundant NOTICE copied from LICENSE. am: fc6a8cb464 am: fa60d37effBob Badour
Change-Id: I817865095df6b23a57a821dfdfb5746f0d6ade46
2020-03-26Remove redundant NOTICE copied from LICENSE. am: fc6a8cb464Bob Badour
Change-Id: Ide30d1863d7f41e960040a53bd67677cd7272c01
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: Idddbb30a2620ce132df9afc701ea850d872ed70b
2019-10-30[automerger skipped] DO NOT MERGE - ↵Xin Li
qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 2354a64555 am: 0dc471014d -s ours am skip reason: subject contains skip directive Change-Id: I6145aca9fb5ebacd87612efca64b64cc9a41ad5c
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-4android-r-preview-3android-r-preview-2Xin Li
stage-aosp-master am: 2354a64555 Change-Id: If5885a2f894ed1bb0013eb47ee61163ad33bb881
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-1Xin Li
stage-aosp-master Bug: 142003500 Change-Id: I49012cf59303c032b456b614cd6e80f8daec4249
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 6ec7626a6b -s ours am: 2f369df28b -s ours am: 6dd0dcf226 -s ours am skip reason: change_id Iec250219138e8c87e80073e51f89be92ff7c4063 with SHA1 2356825d50 is in history Change-Id: Ia2b87a1093b78ce5670bafcf124314a7072f94fb
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 6ec7626a6b -s ours am: 2f369df28b -s ours am skip reason: change_id Iec250219138e8c87e80073e51f89be92ff7c4063 with SHA1 2356825d50 is in history Change-Id: I6b6825f556c8d0687f2c2ba7c67ee41eeee61659
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 6ec7626a6b -s ours am skip reason: change_id Iec250219138e8c87e80073e51f89be92ff7c4063 with SHA1 2356825d50 is in history Change-Id: Ibf66b42bc6e9b1e50cc0a8a32bc99b15b456682c
2019-09-08Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li
No content change. Bug: 135460123 Change-Id: Ie89519bea346d984bce2aae0a9dc5ec6f445d718 Merged-In: Iec250219138e8c87e80073e51f89be92ff7c4063
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ↵Xin Li
2356825d50 -s ours am: cf78c76d7e am: a644a97af6 am: 99b5495101 -s ours am skip reason: subject contains skip directive Change-Id: Ib82ff6782a4aba0c308c3b4c2750f510b7633ac9
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ↵Xin Li
2356825d50 -s ours am: cf78c76d7e am: a644a97af6 Change-Id: I074bbead4f295b35f21bca63938c8c1125966b94
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ↵Xin Li
2356825d50 -s ours am: cf78c76d7e Change-Id: Icd28fc6fd1593fd29bd53a0196573a156c3dab7d
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into masterXin Li
am: 2356825d50 -s ours am skip reason: subject contains skip directive Change-Id: I8c47009e4a9f049d59f7a5f535c0e30137b85f5a
2019-09-04DO NOT MERGE - Merge Android 10 into masterndk-sysroot-r21Xin Li
Bug: 139893257 Change-Id: Iec250219138e8c87e80073e51f89be92ff7c4063
2019-07-02[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor ↵Xin Li
(5699924) into stage-aosp-master am: f39567e296 am: c5e127da75 -s ours am skip reason: subject contains skip directive Change-Id: Id470b6379aa1480cf2a00d67d32769e8a95254c4
2019-07-02DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵Xin Li
stage-aosp-master am: f39567e296 Change-Id: I7863b27e5a987e73697039180dcd6d3140ef336d
2019-07-01DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵temp_140451723Xin Li
stage-aosp-master Bug: 134405016 Change-Id: If7c54609d583c12b6089cbf03d8dfb8f5bb3f4fb
2019-02-24[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterandroid-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseXin Li
am: 4ab0beecd8 -s ours am skip reason: subject contains skip directive Change-Id: I51bcd661e0a30fbdac517c7c95e37b202a19d8ad
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 00:23:36 +0000