Nick Chusid
e53a2cde20
Add support for CR3s with embedded heif thumbnails am: 5c5b671ef7 am: 81b491ff16 am: 8060966efd am: 3b60c65baa
...
Original change: https://android-review.googlesource.com/c/platform/external/piex/+/1726814
Change-Id: Ibf04ad4e11ab521ea8dc8302d084b8544e612280
2021-06-23 18:48:59 +00:00
Nick Chusid
3b60c65baa
Add support for CR3s with embedded heif thumbnails am: 5c5b671ef7 am: 81b491ff16 am: 8060966efd
...
Original change: https://android-review.googlesource.com/c/platform/external/piex/+/1726814
Change-Id: If89e5c212dd4811e1ed61f674a4057c5645a7866
2021-06-23 18:29:58 +00:00
Nick Chusid
8060966efd
Add support for CR3s with embedded heif thumbnails am: 5c5b671ef7 am: 81b491ff16
...
Original change: https://android-review.googlesource.com/c/platform/external/piex/+/1726814
Change-Id: I62117798f535826d6780c0816f92bf8121754ccb
2021-06-08 21:47:53 +00:00
Nick Chusid
81b491ff16
Add support for CR3s with embedded heif thumbnails am: 5c5b671ef7
...
Original change: https://android-review.googlesource.com/c/platform/external/piex/+/1726814
Change-Id: I210b5948329bfa0c263cab308602a579aa964600
2021-06-08 21:18:14 +00:00
Nick Chusid
5c5b671ef7
Add support for CR3s with embedded heif thumbnails
...
Change-Id: I2cb6b1e46ed91961744cc5b795cc7144c6cacb54
2021-06-03 15:35:09 -04:00
Xin Li
3e3815c274
Merge sc-mainline-prod
...
Bug: 189946434
Change-Id: Iab28e075582e4d762ebc7b3cfd65016f1b69cbe0
2021-06-02 16:50:21 +00:00
Xin Li
3e6d6dd5b8
[automerger skipped] Mark ab/7061308 as merged in stage. am: 3ba9f2e739 -s ours am: 4fe3a9d91a -s ours am: 1c7d7561df -s ours
...
am skip reason: Change-Id Ibd77c56ba5d1b395d478ba85263596032fa22144 with SHA-1 c6b7a9171d is in history
Original change: undetermined
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5373371c7ae9b42d5ad9c9de5d3fde4a5b68a112
2021-02-20 14:13:05 +00:00
Xin Li
64e36cd3d8
[automerger skipped] Mark ab/7061308 as merged in stage. am: 3ba9f2e739 -s ours am: 4fe3a9d91a -s ours am: 1c7d7561df -s ours
...
am skip reason: Change-Id Ibd77c56ba5d1b395d478ba85263596032fa22144 with SHA-1 c6b7a9171d is in history
Original change: undetermined
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If43ff2c5ab185471cad63698d22e92fa2135a78f
2021-02-20 14:09:12 +00:00
Xin Li
1c7d7561df
[automerger skipped] Mark ab/7061308 as merged in stage. am: 3ba9f2e739 -s ours am: 4fe3a9d91a -s ours
...
am skip reason: Change-Id Ibd77c56ba5d1b395d478ba85263596032fa22144 with SHA-1 c6b7a9171d is in history
Original change: undetermined
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8a00e93864297ec687798c4283812a0588a45921
2021-02-20 13:40:55 +00:00
Xin Li
4fe3a9d91a
[automerger skipped] Mark ab/7061308 as merged in stage. am: 3ba9f2e739 -s ours
...
am skip reason: Change-Id Ibd77c56ba5d1b395d478ba85263596032fa22144 with SHA-1 c6b7a9171d is in history
Original change: undetermined
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id9916418f3777694e7e4db2c23f1d00e5840541c
2021-02-20 12:29:29 +00:00
Xin Li
3ba9f2e739
Mark ab/7061308 as merged in stage.
...
Bug: 180401296
Merged-In: Ibd77c56ba5d1b395d478ba85263596032fa22144
Change-Id: Ic6bb176a10b07aabad55c5981726151e5e69073a
2021-02-20 00:24:16 -08:00
Bob Badour
7e1fcdfec8
[LSC] Add LOCAL_LICENSE_KINDS to external/piex am: aacf8941ed am: 91339ee8e8 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 23:17:50 +00:00
Bob Badour
999ed0a585
[LSC] Add LOCAL_LICENSE_KINDS to external/piex am: aacf8941ed am: 91339ee8e8 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 23:17:21 +00:00
Bob Badour
f9e3a55136
[LSC] Add LOCAL_LICENSE_KINDS to external/piex am: aacf8941ed am: 91339ee8e8 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 23:02:16 +00:00
Bob Badour
d9a358d0c4
[LSC] Add LOCAL_LICENSE_KINDS to external/piex am: aacf8941ed am: 91339ee8e8
...
Original change: https://android-review.googlesource.com/c/platform/external/piex/+/1588885
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2b502f75bfd52ce1c7f2162c0c5724779733576f
2021-02-16 22:23:19 +00:00
Bob Badour
91339ee8e8
[LSC] Add LOCAL_LICENSE_KINDS to external/piex am: aacf8941ed
...
Original change: https://android-review.googlesource.com/c/platform/external/piex/+/1588885
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0d2bf0e78f639dbee499e984daf4516405f6ac84
2021-02-16 21:45:45 +00:00
Bob Badour
aacf8941ed
[LSC] Add LOCAL_LICENSE_KINDS to external/piex
...
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-12 15:34:51 -08:00
Xin Li
e439865f99
Mark ab/6881855 as merged am: dbd818feda am: c6b7a9171d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/piex/+/13112852
Change-Id: Iab0f963aad80fa9ca99befc47bc21f7992ef54bb
2020-11-24 02:34:21 +00:00
Xin Li
c6b7a9171d
Mark ab/6881855 as merged am: dbd818feda
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/piex/+/13112852
Change-Id: Ibd77c56ba5d1b395d478ba85263596032fa22144
2020-11-24 02:03:16 +00:00
Xin Li
dbd818feda
Mark ab/6881855 as merged
...
Bug: 172690556
Change-Id: I158ba8f69a42688c117da6e6ebda04ea76323772
2020-11-23 11:30:25 -08:00
Justin Yun
9b0e4c017f
Add product_available to product available modules am: 12084de6fb am: 4be711c01e am: ddc6cd6678 am: 6674a049d5
...
Original change: https://android-review.googlesource.com/c/platform/external/piex/+/1496036
Change-Id: I607912c1093eff6c406a509cbcfc62a804399dff
2020-11-12 04:13:25 +00:00
Justin Yun
6674a049d5
Add product_available to product available modules am: 12084de6fb am: 4be711c01e am: ddc6cd6678
...
Original change: https://android-review.googlesource.com/c/platform/external/piex/+/1496036
Change-Id: I07e76af411517deec5516f8f9359921e038c5950
2020-11-12 03:41:23 +00:00
Justin Yun
ddc6cd6678
Add product_available to product available modules am: 12084de6fb am: 4be711c01e
...
Original change: https://android-review.googlesource.com/c/platform/external/piex/+/1496036
Change-Id: Ibe8f2be7aaa58b8c4aa4a16ada839a78e43af30f
2020-11-12 03:27:08 +00:00
Justin Yun
4be711c01e
Add product_available to product available modules am: 12084de6fb
...
Original change: https://android-review.googlesource.com/c/platform/external/piex/+/1496036
Change-Id: Id293562a17d9dc90f7a43db29bfc7bafa05b69c2
2020-11-12 02:45:54 +00:00
Justin Yun
12084de6fb
Add product_available to product available modules
...
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-11 18:22:26 +09:00
Bob Badour
95d3aa21c0
Add METADATA to piex: Apache2=NOTICE am: aebc3d7078 am: d26a14360f am: 6672dabd7c am: f80bdaa14a am: 5e323ee122
...
Change-Id: I1ce56aec086f986c754d3eb518d0ce986879ac9c
2020-04-29 02:01:17 +00:00
Bob Badour
5e323ee122
Add METADATA to piex: Apache2=NOTICE am: aebc3d7078 am: d26a14360f am: 6672dabd7c am: f80bdaa14a
...
Change-Id: Icb6f3072f1af8590c3eeb80c265e19a43df502ed
2020-04-29 01:44:31 +00:00
Bob Badour
f80bdaa14a
Add METADATA to piex: Apache2=NOTICE am: aebc3d7078 am: d26a14360f am: 6672dabd7c
...
Change-Id: I5acb639d28abb13f69691b6492dfa4d839428345
2020-04-29 01:27:35 +00:00
Bob Badour
6672dabd7c
Add METADATA to piex: Apache2=NOTICE am: aebc3d7078 am: d26a14360f
...
Change-Id: I1dffc4d785051abed9903941ae20f4306198862f
2020-04-29 01:08:24 +00:00
Bob Badour
d26a14360f
Add METADATA to piex: Apache2=NOTICE am: aebc3d7078
...
Change-Id: Ie22d72f0686b2d89ea1c1935477c8215d4ccdfbe
2020-04-29 00:52:14 +00:00
Bob Badour
aebc3d7078
Add METADATA to piex: Apache2=NOTICE
...
Bug: 68860345
Bug: 69058154
Bug: 151953481
Test: no code changes
Change-Id: Icdb8f4497ddb30557bee288a5850c450a6a3861f
2020-04-28 09:30:30 -07:00
Xin Li
24d308d417
[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into 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 04:46:31 +00:00
Xin Li
f84f0653e1
[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 35db68a0d0 -s ours am: 946538ac0a am: bf4cbf0a0c
...
Change-Id: Iff1d3fb03e9a00e667c8a7c196d632ecd6212b1a
2020-04-10 04:14:22 +00:00
Xin Li
bf4cbf0a0c
[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 35db68a0d0 -s ours am: 946538ac0a
...
Change-Id: I5401ee0b73d91ed8a722c8804370fc154debd0e8
2020-04-10 03:56:34 +00:00
Xin Li
946538ac0a
[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 35db68a0d0 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I53c05cee55ee778850b817573aa14bb00445e739
2020-04-10 03:17:05 +00:00
Xin Li
35db68a0d0
DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master
...
Bug: 151763422
Change-Id: I552191a63ccba11df8a6c561a402f69c07a67f4a
2020-04-09 17:50:50 -07:00
Bob Badour
e3babc7ab1
Remove redundant NOTICE copied from LICENSE. am: 1a6acddc93 am: ff4efa9976 am: 3ee88901aa am: e7223bef08 am: cb28770760
...
Change-Id: Ide8aa6564e405cb42be9fa2f1421edc32eed35c3
2020-03-30 23:23:49 +00:00
Bob Badour
cb28770760
Remove redundant NOTICE copied from LICENSE. am: 1a6acddc93 am: ff4efa9976 am: 3ee88901aa am: e7223bef08
...
Change-Id: I0811db9bb8143ad61663bf74f2900893f67794af
2020-03-30 23:11:01 +00:00
Bob Badour
e7223bef08
Remove redundant NOTICE copied from LICENSE. am: 1a6acddc93 am: ff4efa9976 am: 3ee88901aa
...
Change-Id: Ia5ddc5b37d97170630f4754a525aeb99c606ed60
2020-03-30 22:51:11 +00:00
Bob Badour
cbc75d4618
Remove redundant NOTICE copied from LICENSE. am: 1a6acddc93 am: ff4efa9976
...
Change-Id: I4231aea9e54a2d7b09be2e740488d724c208ebbc
2020-03-30 22:11:25 +00:00
Bob Badour
3ee88901aa
Remove redundant NOTICE copied from LICENSE. am: 1a6acddc93 am: ff4efa9976
...
Change-Id: Iaacf77638d5d992ef295d6be937086d700f5b133
2020-03-30 22:10:51 +00:00
Bob Badour
ff4efa9976
Remove redundant NOTICE copied from LICENSE. am: 1a6acddc93
...
Change-Id: I416d370bc262a1ccaad8cfe478cb9fafb6ee9810
2020-03-30 21:49:15 +00:00
Bob Badour
1a6acddc93
Remove redundant NOTICE copied from LICENSE.
...
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-25 18:56:49 -07:00
Xin Li
6ff91ae0ac
[automerger skipped] DO NOT MERGE - 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-30 14:22:36 -07:00
Xin Li
b693afb457
DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
...
am: 4ef665fbfe
Change-Id: I9d9c408f8d7b3ddb225d333738a4217b6ed8ec1b
2019-10-30 13:58:49 -07:00
Xin Li
4ef665fbfe
DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
...
Bug: 142003500
Change-Id: I2dd6e97df5643adab8c6b8448ed5d52d0103293b
2019-10-30 11:48:20 -07:00
Xin Li
60e8e5f2b1
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into 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 16:28:40 -07:00
Xin Li
fee2ec0c9c
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into 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 16:00:14 -07:00
Xin Li
60fe5d7033
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
...
am: 4281c5654c -s ours
am skip reason: change_id Iec9970d4c0a3348b9a8aba76fb2ac042fe2453db with SHA1 d454d2a0b9 is in history
Change-Id: Idcf17a7ebfc81205e4c156c4e60cc8a60cd6420e
2019-09-08 15:18:28 -07:00
Xin Li
4281c5654c
Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
...
No content change.
Bug: 135460123
Change-Id: I427e6afe276d5373a1340a16df848e38c4ff600a
Merged-In: Iec9970d4c0a3348b9a8aba76fb2ac042fe2453db
2019-09-08 12:44:02 -07:00