summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-20[LSC] Add LOCAL_LICENSE_KINDS to hardware/ti/am57x am: b337711799 am: ↵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-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-devandroid-t-preview-1android-s-v2-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Bob Badour
e016335a11 am: 251a0ae404 Original change: https://android-review.googlesource.com/c/platform/hardware/ti/am57x/+/1588375 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0ccfd6b90948cff6df04958a3b08135446db9dec
2021-02-19[LSC] Add LOCAL_LICENSE_KINDS to hardware/ti/am57x am: b337711799 am: e016335a11Bob Badour
Original change: https://android-review.googlesource.com/c/platform/hardware/ti/am57x/+/1588375 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3d616dcde2c1e4b7901bb8ea8e83bf320fd919a8
2021-02-19[LSC] Add LOCAL_LICENSE_KINDS to hardware/ti/am57x am: b337711799android-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/hardware/ti/am57x/+/1588375 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2d0d9f584539de03b99156c3dc2ca2af5b56ded4
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to hardware/ti/am57xBob Badour
Added SPDX-license-identifier-Apache-2.0 to: bootctrl/Android.bp Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-MIT to: Android.bp libhwcomposer/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I35cdcb9034e903405bb28f9f239d9f3f1301d453
2020-05-01Add METADATA to am57x: Apache2+MIT=NOTICE am: 5b0ad87878 am: 09c67206f6 am: ↵Bob Badour
d2d2ed5dc1 am: af0ed86bbc am: bb9374610c Change-Id: I17cbc58a08952eb069d3bcc0a840e1979f014d12
2020-05-01Add METADATA to am57x: Apache2+MIT=NOTICE am: 5b0ad87878 am: 09c67206f6 am: ↵android-s-preview-1Bob Badour
d2d2ed5dc1 am: af0ed86bbc Change-Id: I20e70929c5d61469931408e07e07db75617b64ef
2020-05-01Add METADATA to am57x: Apache2+MIT=NOTICE am: 5b0ad87878 am: 09c67206f6 am: ↵Bob Badour
d2d2ed5dc1 Change-Id: I5467543ba1c7a875cca438ea166ebff57c5f9718
2020-05-01Add METADATA to am57x: Apache2+MIT=NOTICE am: 5b0ad87878 am: 09c67206f6Bob Badour
Change-Id: Ia0aed49501f6d4bc4d4be8ffcdbef2b63225387a
2020-05-01Add METADATA to am57x: Apache2+MIT=NOTICE am: 5b0ad87878android-r-beta-3android-r-beta-2Bob Badour
Change-Id: I056847bc7286795f5ce04b769b80462b31397d67
2020-05-01Add METADATA to am57x: Apache2+MIT=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: Id0e6ed9f4337a21c426b97b42207666251c89be9
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 9a54b299c6 -s ours am: a25d8b0667 am: 85ab742c72 am: 960e35d4b3 -s ours am skip reason: subject contains skip directive Change-Id: I3e8c2a4fbb5536e15b96ef9d52c7973657cdc5eb
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 9a54b299c6 -s ours am: a25d8b0667 am: 85ab742c72 Change-Id: I251947d29a42a79dcb91761c73756ce623292cf1
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 9a54b299c6 -s ours am: a25d8b0667 Change-Id: Ibc4102681d542b0c995fd7c5f02ec2cbcb8bdb4d
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 9a54b299c6 -s ours am skip reason: subject contains skip directive Change-Id: Ieea580619bf7db2aecd5a24cbeb982f64e6942b3
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: Ifabbbb551245486f49548265e1ba51b640d5d602
2020-03-26Remove redundant NOTICE copied from LICENSE. am: 4fbaef1b63 am: a555804cdb ↵Bob Badour
am: af68df9224 am: a5dfaaaa78 am: 6d68ca745b Change-Id: I8a94bc831036fb0dc4c7025997cd60ba53b77db6
2020-03-26Remove redundant NOTICE copied from LICENSE. am: 4fbaef1b63 am: a555804cdb ↵Bob Badour
am: af68df9224 am: a5dfaaaa78 Change-Id: I4a28b25e32bcbf03feea95bee63b2ea16403cac9
2020-03-26Remove redundant NOTICE copied from LICENSE. am: 4fbaef1b63 am: a555804cdb ↵Bob Badour
am: af68df9224 Change-Id: If7c24d418551e390befebbbb6e9a8e007ea35a45
2020-03-26Remove redundant NOTICE copied from LICENSE. am: 4fbaef1b63 am: a555804cdbBob Badour
Change-Id: I1663399d8e28ae4d380e72e92c8edb85f1493f9d
2020-03-26Remove redundant NOTICE copied from LICENSE. am: 4fbaef1b63 am: a555804cdbBob Badour
Change-Id: Id2620245fa1a8234e60e540c134bccdf2cb9fd32
2020-03-26Remove redundant NOTICE copied from LICENSE. am: 4fbaef1b63Bob Badour
Change-Id: I70f0f453c9e25aef36ca0d5ffef2474b44450355
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: I9e0a9adfb7d70dea567674d4ddf05ec5b664f800
2019-12-18Add drm hwc support am: eebe4a5562 am: 1ad4d16180 am: 2fb5135b44r_aml_301500702android-mainline-12.0.0_r55android-mainline-12.0.0_r112android-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_r10aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseandroid11-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-releaseaml_tz2_305400100Automerger Merge Worker
Change-Id: I5caf7cd0aa5962eb5c20a6a70452d9557b65c5a5
2019-12-18Add drm hwc support am: eebe4a5562 am: 1ad4d16180android-r-preview-4android-r-preview-3android-r-preview-2Automerger Merge Worker
Change-Id: I22f937245806cc3795f8b7ce4f0ee4afdebe545f
2019-12-18Add drm hwc supportMykhailo Sopiha
am: eebe4a5562 Change-Id: If326418a3b53c1761a117eb41bcb0220f55d11c2
2019-12-12Add drm hwc supportandroid-r-preview-1Mykhailo Sopiha
Rename hal_public.h to fit expected DRM HWC upstreamed imagination header file. Adjust corresponding includes. Change-Id: I8c2ac7158ca0dd2ba4662e34cb5f2435ef1405d1 Signed-off-by: Mykhailo Sopiha <mykhailo.sopiha@linaro.org>
2019-10-30[automerger skipped] DO NOT MERGE - ↵Xin Li
qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 2afda455c2 am: 848b54cabd -s ours am skip reason: subject contains skip directive Change-Id: I65f9a98ecdba8479823fdde0c11992866fb43153
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵Xin Li
stage-aosp-master am: 2afda455c2 Change-Id: Ie00262d9113d972af655150e17e689e1aff5ee09
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵Xin Li
stage-aosp-master Bug: 142003500 Change-Id: Id419f1f0307d495cb25ca744630896c2b1a1a18a
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: ed56d56f58 -s ours am: 7d45a3ff9a -s ours am: 9427581bd3 -s ours am skip reason: change_id I7ac6c92e1b64ccf5860de04b17a448046e1af8fe with SHA1 be2c54c3e4 is in history Change-Id: Ie2de554cf4e50f069138015f35ee868d2837b9cc
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: ed56d56f58 -s ours am: 7d45a3ff9a -s ours am skip reason: change_id I7ac6c92e1b64ccf5860de04b17a448046e1af8fe with SHA1 be2c54c3e4 is in history Change-Id: I8866ffef6a7434b10bd019e2faa3fd3949808f9f
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: ed56d56f58 -s ours am skip reason: change_id I7ac6c92e1b64ccf5860de04b17a448046e1af8fe with SHA1 be2c54c3e4 is in history Change-Id: I3515822c9c95c70441777580ef0fc58499c16e91
2019-09-08Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li
No content change. Bug: 135460123 Change-Id: Ic8cbefbf3c8f4fee7597c6f599a5d6679ea2d820 Merged-In: I7ac6c92e1b64ccf5860de04b17a448046e1af8fe
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ↵Xin Li
be2c54c3e4 -s ours am: a693ba8df2 am: 9a3d1de220 am: 1ceed51173 -s ours am skip reason: subject contains skip directive Change-Id: I2484f6d8e339094139988166f1a81444852ee4d0
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ↵Xin Li
be2c54c3e4 -s ours am: a693ba8df2 am: 9a3d1de220 Change-Id: I95996a07465d7fceec7da598546672ef54a20cdb
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ↵Xin Li
be2c54c3e4 -s ours am: a693ba8df2 Change-Id: I980c57dba28736bf4ae6a997a650ebe8381fa7ef
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into masterXin Li
am: be2c54c3e4 -s ours am skip reason: subject contains skip directive Change-Id: I7f989ec43e65c80393c64d23025b1826aa2190f1
2019-09-04DO NOT MERGE - Merge Android 10 into masterndk-sysroot-r21Xin Li
Bug: 139893257 Change-Id: I7ac6c92e1b64ccf5860de04b17a448046e1af8fe
2019-07-08libhwcomposer: Remove vestigial DSS composition properties am: 44ab9eeb0e ↵Andrew F. Davis
am: 8e264eeed7 am: 522e21e30f am: 3e2fbbf219 Change-Id: I2f7bb0c9896e8936f38f69d839dcec723d5c76c6
2019-07-08libhwcomposer: Remove vestigial DSS composition properties am: 44ab9eeb0e ↵Andrew F. Davis
am: 8e264eeed7 am: 522e21e30f Change-Id: I15c2cf311738458efa4416bdab30a5a9a54d6c60
2019-07-08libhwcomposer: Remove vestigial DSS composition properties am: 44ab9eeb0etemp_140451723Andrew F. Davis
am: 8e264eeed7 Change-Id: I2a92cb29e80c16154768c5e38d5866d64c4971f6
2019-07-08libhwcomposer: Remove vestigial DSS composition propertiesAndrew F. Davis
am: 44ab9eeb0e Change-Id: I5161fbe9b1696f82b4eee9289e65b4ba5f62cc0d
2019-07-02[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor ↵Xin Li
(5699924) into stage-aosp-master am: 1c66f0d70e -s ours am: ea452f36b9 am: f6bd518ff8 -s ours am skip reason: subject contains skip directive Change-Id: I31f77d3afb84af13baa425ace2cad39e224cff79
2019-07-02[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor ↵Xin Li
(5699924) into stage-aosp-master am: 1c66f0d70e -s ours am: ea452f36b9 Change-Id: If81cb9e4d384c4f211cddba5197c618ed505c9a0
2019-07-02[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor ↵Xin Li
(5699924) into stage-aosp-master am: 1c66f0d70e -s ours am skip reason: subject contains skip directive Change-Id: Ie5f11c8cbc9df64e6f429de62830a2c0ca76d469
2019-07-01DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵Xin Li
stage-aosp-master Bug: 134405016 Change-Id: I9f971f876b1817067f8a1904057ff9440f219c0f
2019-07-01OWNERS: Fix my LDAP and add Andrew and Sam am: c3bdd9290e am: be9e857f0a am: ↵Alistair Delva
b93aead310 am: 7eaeb0489f Change-Id: I61f99d34adcc47f1ee03b8e3deae257a5a1eec13
2019-07-01OWNERS: Fix my LDAP and add Andrew and Sam am: c3bdd9290e am: be9e857f0aAlistair Delva
am: b93aead310 Change-Id: I8622b288d4dee5df5c646385de8ffbd16c54e5c4
2019-07-01OWNERS: Fix my LDAP and add Andrew and Sam am: c3bdd9290eAlistair Delva
am: be9e857f0a Change-Id: I9d810c003a067576d23da8017b435ccd3bac612e
2019-07-01OWNERS: Fix my LDAP and add Andrew and SamAlistair Delva
am: c3bdd9290e Change-Id: Ic8a123cd55188ce499db8010758331128acdc32d
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-13 22:22:56 +0000