aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-2android-s-beta-1Xin Li
Bug: 180401296 Merged-In: Ibd77c56ba5d1b395d478ba85263596032fa22144 Change-Id: Ic6bb176a10b07aabad55c5981726151e5e69073a
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/piex am: aacf8941ed am: 91339ee8e8 ↵Bob Badour
am: d9a358d0c4 am: f9e3a55136 Original change: https://android-review.googlesource.com/c/platform/external/piex/+/1588885 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I964749301956d44d984ed49d9eac2b64de01e0d6
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/piex am: aacf8941ed am: 91339ee8e8 ↵Bob Badour
am: d9a358d0c4 am: f9e3a55136 Original change: https://android-review.googlesource.com/c/platform/external/piex/+/1588885 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I97c1aef44a96c941d1352e549605f126aa795ae8
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/piex am: aacf8941ed am: 91339ee8e8 ↵Bob Badour
am: d9a358d0c4 Original change: https://android-review.googlesource.com/c/platform/external/piex/+/1588885 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I10def31f1faac38ef5c455edcd463f36933adbb7
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/piex am: aacf8941ed am: 91339ee8e8Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/piex/+/1588885 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2b502f75bfd52ce1c7f2162c0c5724779733576f
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/piex am: aacf8941edBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/piex/+/1588885 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0d2bf0e78f639dbee499e984daf4516405f6ac84
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/piexandroid-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: Idb404d88f2f74aa2c84877417f5414ae08d6502f
2021-02-01Snap for 7116807 from dbd818fedae82d9211280d62d5a832309a5669a8 to ↵android-build-prod (mdb)
simpleperf-release Change-Id: I905887de9af14aee3b0d761100ab11ea9adb81e8
2020-11-30Snap for 7002008 from 12084de6fb1438acb6cffd75d7eeea7d6c974c5d to ↵android-build-prod (mdb)
simpleperf-release Change-Id: I83781dc295648bd479af46b2636265337d2ac3d4
2020-11-24Mark ab/6881855 as merged am: dbd818feda am: c6b7a9171dXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/piex/+/13112852 Change-Id: Iab0f963aad80fa9ca99befc47bc21f7992ef54bb
2020-11-24Mark ab/6881855 as merged am: dbd818fedaXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/piex/+/13112852 Change-Id: Ibd77c56ba5d1b395d478ba85263596032fa22144
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I158ba8f69a42688c117da6e6ebda04ea76323772
2020-11-12Add product_available to product available modules am: 12084de6fb am: ↵Justin Yun
4be711c01e am: ddc6cd6678 am: 6674a049d5 Original change: https://android-review.googlesource.com/c/platform/external/piex/+/1496036 Change-Id: I607912c1093eff6c406a509cbcfc62a804399dff
2020-11-12Add product_available to product available modules am: 12084de6fb am: ↵Justin Yun
4be711c01e am: ddc6cd6678 Original change: https://android-review.googlesource.com/c/platform/external/piex/+/1496036 Change-Id: I07e76af411517deec5516f8f9359921e038c5950
2020-11-12Add product_available to product available modules am: 12084de6fb am: 4be711c01eJustin Yun
Original change: https://android-review.googlesource.com/c/platform/external/piex/+/1496036 Change-Id: Ibe8f2be7aaa58b8c4aa4a16ada839a78e43af30f
2020-11-12Add product_available to product available modules am: 12084de6fbJustin Yun
Original change: https://android-review.googlesource.com/c/platform/external/piex/+/1496036 Change-Id: Id293562a17d9dc90f7a43db29bfc7bafa05b69c2
2020-11-11Add product_available to product available modulesJustin Yun
vendor_available modules were available to product modules. However, not all vendor_available modules are required to be available to product modules. Some modules want to be available only to product modules but not vendor modules. To cover the requirement, we separate product_available from vendor_available. vendor_available will not provide product available module. Bug: 150902910 Test: build Change-Id: Iee663ffd1666985bccd92ef68f051c5b6f3f8204
2020-11-06Add support for CR3s with embedded heif thumbnailsNick Chusid
2020-09-17Snap for 6844436 from 6672dabd7cb3b6c4ee86a366522f3a6e7e104967 to ↵android-build-prod (mdb)
simpleperf-release Change-Id: I24f17759fb99bf5580bb16b4d2b5fbc3f3f30263
2020-06-10Snap for 6577974 from d26a14360f1b3bb546934467a50039ab09e50ad8 to ↵android-build-prod (mdb)
simpleperf-release Change-Id: I15b1de3e3c9cf61c765ca1ef2a293aad0ab82805
2020-04-29Add METADATA to piex: Apache2=NOTICE am: aebc3d7078 am: d26a14360f am: ↵Bob Badour
6672dabd7c am: f80bdaa14a am: 5e323ee122 Change-Id: I1ce56aec086f986c754d3eb518d0ce986879ac9c
2020-04-29Add METADATA to piex: Apache2=NOTICE am: aebc3d7078 am: d26a14360f am: ↵Bob Badour
6672dabd7c am: f80bdaa14a Change-Id: Icb6f3072f1af8590c3eeb80c265e19a43df502ed
2020-04-29Add METADATA to piex: Apache2=NOTICE am: aebc3d7078 am: d26a14360f am: ↵Bob Badour
6672dabd7c Change-Id: I5acb639d28abb13f69691b6492dfa4d839428345
2020-04-29Add METADATA to piex: Apache2=NOTICE am: aebc3d7078 am: d26a14360fBob Badour
Change-Id: I1dffc4d785051abed9903941ae20f4306198862f
2020-04-29Add METADATA to piex: Apache2=NOTICE am: aebc3d7078android-r-beta-3android-r-beta-2Bob Badour
Change-Id: Ie22d72f0686b2d89ea1c1935477c8215d4ccdfbe
2020-04-28Add METADATA to piex: Apache2=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: Icdb8f4497ddb30557bee288a5850c450a6a3861f
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 35db68a0d0 -s ours am: 946538ac0a am: bf4cbf0a0c am: f84f0653e1 -s ours am skip reason: subject contains skip directive Change-Id: If18c702fea4efd29a3f2cb7d930a377ccbd0d888
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 35db68a0d0 -s ours am: 946538ac0a am: bf4cbf0a0c Change-Id: Iff1d3fb03e9a00e667c8a7c196d632ecd6212b1a
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 35db68a0d0 -s ours am: 946538ac0a Change-Id: I5401ee0b73d91ed8a722c8804370fc154debd0e8
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 35db68a0d0 -s ours am skip reason: subject contains skip directive Change-Id: I53c05cee55ee778850b817573aa14bb00445e739
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: I552191a63ccba11df8a6c561a402f69c07a67f4a
2020-04-01Snap for 6355748 from 1a6acddc93a80e5a72f15e7f983674084479719c to ↵android-build-prod (mdb)
simpleperf-release Change-Id: I4a0dbd29f35f5c37e081d91de12bc778a32da105
2020-03-30Remove redundant NOTICE copied from LICENSE. am: 1a6acddc93 am: ff4efa9976 ↵Bob Badour
am: 3ee88901aa am: e7223bef08 am: cb28770760 Change-Id: Ide8aa6564e405cb42be9fa2f1421edc32eed35c3
2020-03-30Remove redundant NOTICE copied from LICENSE. am: 1a6acddc93 am: ff4efa9976 ↵Bob Badour
am: 3ee88901aa am: e7223bef08 Change-Id: I0811db9bb8143ad61663bf74f2900893f67794af
2020-03-30Remove redundant NOTICE copied from LICENSE. am: 1a6acddc93 am: ff4efa9976 ↵Bob Badour
am: 3ee88901aa Change-Id: Ia5ddc5b37d97170630f4754a525aeb99c606ed60
2020-03-30Remove redundant NOTICE copied from LICENSE. am: 1a6acddc93 am: ff4efa9976Bob Badour
Change-Id: I4231aea9e54a2d7b09be2e740488d724c208ebbc
2020-03-30Remove redundant NOTICE copied from LICENSE. am: 1a6acddc93 am: ff4efa9976Bob Badour
Change-Id: Iaacf77638d5d992ef295d6be937086d700f5b133
2020-03-30Remove redundant NOTICE copied from LICENSE. am: 1a6acddc93Bob Badour
Change-Id: I416d370bc262a1ccaad8cfe478cb9fafb6ee9810
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: Ia65d6b609f15d3d1afe6033d9e1c27db29fcfaaa
2020-03-20Snap for 6317425 from b693afb4579d0744585f1ff9d6eaa20e4044a6b0 to ↵android-build-prod (mdb)
simpleperf-release Change-Id: If8eb789a738158fa55503779a3b7dd68a32f705a
2019-12-17Snap for 6079754 from 4ef665fbfefde0dfaa764cad81d7170ff5667bcd to ↵android-build-prod (mdb)
simpleperf-release Change-Id: Ibd9a4cf780bbe6c15d05890ddc90b71e5ef2e9e4
2019-11-06Snap for 5991463 from 4281c5654c74f314fe1a38a496cb32857e756c12 to ↵android-build-prod (mdb)
simpleperf-release Change-Id: Ib9544a6bfdda1144483154e47a353065a6e3750e
2019-10-30[automerger skipped] DO NOT MERGE - ↵r_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-releaseXin Li
qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 4ef665fbfe am: b693afb457 -s ours am skip reason: subject contains skip directive Change-Id: I18ed44c85658bc46ed6075c283f53997ec3854c1
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: 4ef665fbfe Change-Id: I9d9c408f8d7b3ddb225d333738a4217b6ed8ec1b
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: I2dd6e97df5643adab8c6b8448ed5d52d0103293b
2019-10-11Snap for 5933730 from d454d2a0b98ee015eda502bc0285f1ce5160d9e5 to ↵android-build-prod (mdb)
simpleperf-release Change-Id: I71facf46e1262793e4b6aa6f886f5092e86b3a8b
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 4281c5654c -s ours am: 60fe5d7033 -s ours am: fee2ec0c9c -s ours am skip reason: change_id Iec9970d4c0a3348b9a8aba76fb2ac042fe2453db with SHA1 d454d2a0b9 is in history Change-Id: I7bb0f1f88c73048b278695ba9dc56da59a46b302
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 4281c5654c -s ours am: 60fe5d7033 -s ours am skip reason: change_id Iec9970d4c0a3348b9a8aba76fb2ac042fe2453db with SHA1 d454d2a0b9 is in history Change-Id: I7d8600d46111c6dba418fde67393f1e2a97355c5
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 4281c5654c -s ours am skip reason: change_id Iec9970d4c0a3348b9a8aba76fb2ac042fe2453db with SHA1 d454d2a0b9 is in history Change-Id: Idcf17a7ebfc81205e4c156c4e60cc8a60cd6420e
2019-09-08Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li
No content change. Bug: 135460123 Change-Id: I427e6afe276d5373a1340a16df848e38c4ff600a Merged-In: Iec9970d4c0a3348b9a8aba76fb2ac042fe2453db