aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/jsmn am: eb966c669e am: 2c4522fd94 ↵android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-3android-s-v2-beta-2android-s-qpr3-beta-1android-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-releaseandroid-t-preview-1android-s-v2-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Bob Badour
am: de27aa6d7b Original change: https://android-review.googlesource.com/c/platform/external/jsmn/+/1589014 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I92f4d7b43aad1d088d6e08a6956ecfcc066bb16b
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/jsmn am: eb966c669e am: 2c4522fd94Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/jsmn/+/1589014 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I951c53f99875e439f8ffd4ce4ae36ab39f1076d2
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/jsmn am: eb966c669eandroid-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/jsmn/+/1589014 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia3f40e8b542547912f95d15989346f79c109f296
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/jsmnandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-BSD SPDX-license-identifier-MIT to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Ic9e10a6683062f34c24e1ddd69b005be741e49df
2020-04-24Add license type: Apache2+BSD+MIT is NOTICE license am: 41c1e10c02 am: ↵Bob Badour
d876b9096d am: 6b1de7e241 am: 10c1e94035 am: 118c5bf20f Change-Id: I40c11d0879e74fb616f5331c11b4f19dd9c1e25b
2020-04-24Add license type: Apache2+BSD+MIT is NOTICE license am: 41c1e10c02 am: ↵Bob Badour
d876b9096d am: 6b1de7e241 am: 10c1e94035 Change-Id: I3427bee7e87672fbd94ecb7a2edda8e28990aeb1
2020-04-24Add license type: Apache2+BSD+MIT is NOTICE license am: 41c1e10c02 am: ↵Bob Badour
d876b9096d am: 6b1de7e241 Change-Id: I35eda1cb495a122110b37bd084758501be6c4821
2020-04-24Add license type: Apache2+BSD+MIT is NOTICE license am: 41c1e10c02 am: ↵Bob Badour
d876b9096d Change-Id: I3e4c6639e02ac853f1a5a2507f0edebb0622fa89
2020-04-24Add license type: Apache2+BSD+MIT is NOTICE license am: 41c1e10c02android-r-beta-3android-r-beta-2Bob Badour
Change-Id: I5f7d20eec5d4fe8644dd2c604a816e0e2412d2ea
2020-04-23Add license type: Apache2+BSD+MIT is NOTICE licenseBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: Id832ad09026c6442cd48c8d1509f310b49940a1d
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 01d61ece0f -s ours am: 5766893ca0 am: d495b78203 am: fa50cde2fc -s ours am skip reason: subject contains skip directive Change-Id: I351e170cd798952ea9d3d88094c4a96567dba5cc
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 01d61ece0f -s ours am: 5766893ca0 am: d495b78203 Change-Id: Ib88ab6f49ebe75cfe07757a9e5174574f40a94f0
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 01d61ece0f -s ours am: 5766893ca0 Change-Id: Ice37cc359ab4458b534c66748edea7d4a1a3395d
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 01d61ece0f -s ours am skip reason: subject contains skip directive Change-Id: I2a6915884f2f28f4924d2fc88c6e849fee20dd97
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: I1645d1e6a5ad0ed145ccb41a9529bc4d85210edb
2020-03-26Remove redundant NOTICE copied from LICENSE. am: 683cdec646 am: 0da94a7be9 ↵Bob Badour
am: a73b4db6da am: 1951e9ca31 am: 304f567415 Change-Id: I8f7a46a32436bb37e7f020e61b093b6e79b552c1
2020-03-26Remove redundant NOTICE copied from LICENSE. am: 683cdec646 am: 0da94a7be9 ↵Bob Badour
am: a73b4db6da am: 1951e9ca31 Change-Id: Ie50b3fcbcf0237546247e058048cfda0d8dcfc1f
2020-03-26Remove redundant NOTICE copied from LICENSE. am: 683cdec646 am: 0da94a7be9 ↵Bob Badour
am: a73b4db6da Change-Id: Iae8156a455ca0160e8b9a239b4cf202b2cb4b126
2020-03-26Remove redundant NOTICE copied from LICENSE. am: 683cdec646 am: 0da94a7be9Bob Badour
Change-Id: I5f9de2f29760cf93b2cc2a7d26352ab2c2442e6a
2020-03-26Remove redundant NOTICE copied from LICENSE. am: 683cdec646 am: 0da94a7be9Bob Badour
Change-Id: I6e4e31d2f2678df57cb438783532f4a9d6fb4812
2020-03-26Remove redundant NOTICE copied from LICENSE. am: 683cdec646Bob Badour
Change-Id: I4892ce8fc1da132ee7b60e080272748291f17a9f
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: I5ad789c2ffe8eab4948e3da4812394bd7f799533
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 042bca17cf -s ours am: 1ef828c226 am: aad0f1482b am: a83ff21b63 -s ours am skip reason: subject contains skip directive Change-Id: I63e873062563ecf7f5af5f8e20b9ca34a6c7c515
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 042bca17cf -s ours am: 1ef828c226 am: aad0f1482b Change-Id: I1cf23dd4206e204598fc2f8a5a085e64668de1fc
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 042bca17cf -s ours am: 1ef828c226 Change-Id: I9918e69f6c01900bdfe0e2e7a7d2b937dd6ed745
2020-03-19DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into ↵Xin Li
stag-aosp-master am: 042bca17cf Change-Id: Ib426ca93be40db81119f91498181f2f15728c56f
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 042bca17cf -s ours am skip reason: subject contains skip directive Change-Id: I87a9b2661adcedd28764400816b33ae4508ee1a4
2020-03-18DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: Id3bd9abeab4fa8b6943abc2a8f30790d8adcd997
2020-03-01Change jsmn to follow update releases am: 262b785fb0 am: baeaf082cc am: ↵Automerger Merge Worker
7a166ace4c am: 2ecbb1c8f5 am: 9ab17c530b Change-Id: If3f1f00452e337e3e480302356e1c6c769ed8c19
2020-03-01Change jsmn to follow update releases am: 262b785fb0 am: baeaf082cc am: ↵Automerger Merge Worker
7a166ace4c am: 2ecbb1c8f5 Change-Id: I21440d04800bdd2a63e59eaddb48bfff38040dd8
2020-02-29Change jsmn to follow update releases am: 262b785fb0 am: baeaf082cc am: ↵Automerger Merge Worker
7a166ace4c Change-Id: Iabd0c1d1f6acbdcf4b0dbc4a10a5c5d0fcb88fc8
2020-02-29Change jsmn to follow update releases am: 262b785fb0 am: baeaf082ccAutomerger Merge Worker
Change-Id: I851ee0fe870d9aed7628bdcedaaac3c7b48b23c1
2020-02-29Change jsmn to follow update releases am: 262b785fb0 am: baeaf082ccAutomerger Merge Worker
Change-Id: If68f1ae1fad681182e75abaa502c6a426f39fd4c
2020-02-29Change jsmn to follow update releases am: 262b785fb0android-r-preview-4android-r-preview-3android-r-preview-2Automerger Merge Worker
Change-Id: I08352d91bad8037c3754b5cb73d5d187a27255f3
2020-02-29Change jsmn to follow update releasesHaibo Huang
Change-Id: I06984bd2337f04980928d38ed44a2228206b1303
2019-12-29Remove include/jsmn.h am: 080ff0d1cb am: fc94e357bb am: 228a2c4642r_aml_301500702android-mainline-12.0.0_r55android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r45android-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_r4android-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_r33android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-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_r2android-mainline-11.0.0_r19android-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_r12android-mainline-11.0.0_r10android-mainline-11.0.0_r1android-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-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_r18android-11.0.0_r16android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10android11-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-mainline-tethering-releaseandroid11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-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-devandroid11-d2-releaseandroid11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid11-d1-b-releaseAutomerger Merge Worker
Change-Id: I7de0eb169b5085e1ee678600876e4b04be16af00
2019-12-29Remove include/jsmn.h am: 080ff0d1cb am: fc94e357bbAutomerger Merge Worker
Change-Id: I784ef5e60a8a159bc3e25d4d7e67798aa1894e0c
2019-12-29Remove include/jsmn.hHaibo Huang
am: 080ff0d1cb Change-Id: Ibe7bd62684383461f21d8e6f624acf72d74fd468
2019-12-27Remove include/jsmn.handroid-r-preview-1Haibo Huang
After aosp/1039113, this is not necessary. Change-Id: I36a5416dbadc80cc7be46a4a2ac49c86773c12ea
2019-07-15Upgrade jsmn to v1.1.0 am: 00b4ac4d1e am: dd5d1b4518 am: 9f412a37f5Haibo Huang
am: ec8c841964 Change-Id: Ia46548ba42148bb479433385e6e7dc701761c84e
2019-07-15Upgrade jsmn to v1.1.0 am: 00b4ac4d1e am: dd5d1b4518android-mainline-10.0.0_r8android-mainline-10.0.0_r6android10-mainline-resolv-releaseandroid10-mainline-networking-releaseHaibo Huang
am: 9f412a37f5 Change-Id: I5b7c563c397d82a6ae4d0967c794edd77f0cbfa2
2019-07-15Upgrade jsmn to v1.1.0 am: 00b4ac4d1eHaibo Huang
am: dd5d1b4518 Change-Id: Ib0b1edea1c026f032f9b6ebcf1944b4e93c2f8c9
2019-07-15Upgrade jsmn to v1.1.0ndk-sysroot-r21Haibo Huang
am: 00b4ac4d1e Change-Id: I128c0f4e0119e016d70a1b81e3261309221d07ac
2019-07-15Upgrade jsmn to v1.1.0Haibo Huang
Test: None Change-Id: I744a16dbda815b6a3ff8991191f39c72e71cd33c
2019-05-24Upgrade jsmn to fdcef3ebf886fa210d14956d3c068a653e76a24e am: 9d58f79ce6 am: ↵Haibo Huang
873006f063 am: a1dcedc436 am: 98939ff323 Change-Id: Ice3149c49dc5806478c3eba13f865392ca3edccb
2019-05-24Upgrade jsmn to fdcef3ebf886fa210d14956d3c068a653e76a24e am: 9d58f79ce6 am: ↵Haibo Huang
873006f063 am: a1dcedc436 Change-Id: I3638acb5eca9d59fa4e7bdf318f7a4a27b07b468
2019-05-24Upgrade jsmn to fdcef3ebf886fa210d14956d3c068a653e76a24e am: 9d58f79ce6Haibo Huang
am: 873006f063 Change-Id: I0a04b02bd1df00ba74eb77edb2e6fbc3e6efefe4
2019-05-24Upgrade jsmn to fdcef3ebf886fa210d14956d3c068a653e76a24eHaibo Huang
am: 9d58f79ce6 Change-Id: I491214cf39c12c84416200e55ed536ffc0e5d207
2019-05-23Upgrade jsmn to fdcef3ebf886fa210d14956d3c068a653e76a24eandroid-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13Haibo Huang
Test: None Change-Id: I20be18b59ca9f378213b01e98b5938a20cdc3eda
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospandroid-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: 3a38b1d7ea Change-Id: I2f65bbd65b3de49e55b9a45f9fd3c82fcebeb132
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 08:38:10 +0000