aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add METADATA to piex: Apache2=NOTICE am: aebc3d7078 am: d26a14360fHEADmasterBob Badour2020-04-291-0/+3
|\ | | | | | | Change-Id: I1dffc4d785051abed9903941ae20f4306198862f
| * Add METADATA to piex: Apache2=NOTICE am: aebc3d7078android-r-beta-3android-r-beta-2Bob Badour2020-04-291-0/+3
| |\ | | | | | | | | | Change-Id: Ie22d72f0686b2d89ea1c1935477c8215d4ccdfbe
| | * Add METADATA to piex: Apache2=NOTICEBob Badour2020-04-281-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: Icdb8f4497ddb30557bee288a5850c450a6a3861f
* | | [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li2020-04-100-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | stag-aosp-master am: 35db68a0d0 -s ours am skip reason: subject contains skip directive Change-Id: I53c05cee55ee778850b817573aa14bb00445e739
| * | DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li2020-04-090-0/+0
| |\ \ | | | | | | | | | | | | | | | | Bug: 151763422 Change-Id: I552191a63ccba11df8a6c561a402f69c07a67f4a
| | * \ Remove redundant NOTICE copied from LICENSE. am: 1a6acddc93 am: ff4efa9976Bob Badour2020-03-301-202/+0
| | |\ \ | | |/ / | |/| | | | | | Change-Id: I4231aea9e54a2d7b09be2e740488d724c208ebbc
* | | | Remove redundant NOTICE copied from LICENSE. am: 1a6acddc93 am: ff4efa9976Bob Badour2020-03-301-202/+0
|\| | | | | | | | | | | | | | | Change-Id: Iaacf77638d5d992ef295d6be937086d700f5b133
| * | | Remove redundant NOTICE copied from LICENSE. am: 1a6acddc93Bob Badour2020-03-301-202/+0
| |\ \ \ | | |/ / | |/| / | | |/ Change-Id: I416d370bc262a1ccaad8cfe478cb9fafb6ee9810
| | * Remove redundant NOTICE copied from LICENSE.Bob Badour2020-03-251-202/+0
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | [automerger skipped] DO NOT MERGE - ↵android-mainline-11.0.0_r1android11-mainline-releaseandroid11-devXin Li2019-10-300-0/+0
|\| | | | | | | | | | | | | | | | | 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
| * DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-4android-r-preview-3android-r-preview-2Xin Li2019-10-300-0/+0
| |\ | | | | | | | | | | | | | | | | | | | | | stage-aosp-master am: 4ef665fbfe Change-Id: I9d9c408f8d7b3ddb225d333738a4217b6ed8ec1b
| | * DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-1Xin Li2019-10-300-0/+0
| | |\ | | |/ | |/| | | | | | | | | | | | | stage-aosp-master Bug: 142003500 Change-Id: I2dd6e97df5643adab8c6b8448ed5d52d0103293b
* | | [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li2019-09-080-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li2019-09-080-0/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li2019-09-080-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master am: 4281c5654c -s ours am skip reason: change_id Iec9970d4c0a3348b9a8aba76fb2ac042fe2453db with SHA1 d454d2a0b9 is in history Change-Id: Idcf17a7ebfc81205e4c156c4e60cc8a60cd6420e
| | | * Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li2019-09-080-0/+0
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No content change. Bug: 135460123 Change-Id: I427e6afe276d5373a1340a16df848e38c4ff600a Merged-In: Iec9970d4c0a3348b9a8aba76fb2ac042fe2453db
* | | | | Enable static builds of libpiex am: fe0cffa94e am: d454d2a0b9 am: af8376fbc0 ↵Jerome Gaillard2019-08-281-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 25c0d9db37 am: 91ddccf479 Change-Id: I09c364ed5b86c3caf4b2f9d3836ed29e98e30a4b
| * | | | Enable static builds of libpiex am: fe0cffa94e am: d454d2a0b9 am: af8376fbc0Jerome Gaillard2019-08-281-1/+1
| |\| | | | | |_|/ | |/| | | | | | | | | | | | | | am: 25c0d9db37 Change-Id: I2228ed45980615cbec7dedf2ecc078f48e6501b6
| | * | Enable static builds of libpiex am: fe0cffa94e am: d454d2a0b9Jerome Gaillard2019-08-281-1/+1
| |/| | | | | | | | | | | | | | | | | | | | | | am: af8376fbc0 Change-Id: I0c0a8480bddc24a1b22f52a2720ac9896ba21553
| | * | Enable static builds of libpiex am: fe0cffa94eJerome Gaillard2019-08-281-1/+1
| | |\| | | | | | | | | | | | | | | | | | | | | am: d454d2a0b9 Change-Id: I78b2978763b24c6a54ccb25ebd200b96454b9b72
| | | * Enable static builds of libpiexndk-sysroot-r21Jerome Gaillard2019-08-281-1/+1
| | |/| | | | | | | | | | | | | | | | | | | | | am: fe0cffa94e Change-Id: Iec9970d4c0a3348b9a8aba76fb2ac042fe2453db
| | | * Enable static builds of libpiexJerome Gaillard2019-06-271-1/+1
| | | | | | | | | | | | | | | | | | | | Test: m libpiex Change-Id: I91b7fbd0babf2f2f17fc927c1f561913361b32c0
* | | | Change PIEX owners to current Photos Backend members. am: 5bd3a7a77d am: ↵Nick Chusid2019-06-181-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 02484e2074 am: f32cc864f9 am: 7f67a0d6d9 Change-Id: I579a772c455b67aca85487738f6c072932558689
| * | | Change PIEX owners to current Photos Backend members. am: 5bd3a7a77d am: ↵Nick Chusid2019-06-181-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 02484e2074 am: f32cc864f9 Change-Id: I2bacd4384e6a6b341553e34fa0dd3b57087626be
| | * | Change PIEX owners to current Photos Backend members. am: 5bd3a7a77dNick Chusid2019-06-181-2/+2
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | am: 02484e2074 Change-Id: I2f9dcf577d490ed1895ae2bf82121e78b35e27f6
| | | * | Change PIEX owners to current Photos Backend members.Nick Chusid2019-06-181-2/+2
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | am: 5bd3a7a77d Change-Id: I1f8e2ba49fcbffbbb92723cb47ccc8d7aa740d18
| | | | * Change PIEX owners to current Photos Backend members.android-o-mr1-iot-release-1.0.14Nick Chusid2019-06-171-2/+2
| | | | |
* | | | | Update PIEX am: b67d26c8dc am: 33d212717c am: 1cc5848033Nick Chusid2019-05-311-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: f54016a712 Change-Id: Ic689f36e92dff1493ad2bf324aa3e7bd64a76aa1
| * | | | Update PIEX am: b67d26c8dc am: 33d212717cNick Chusid2019-05-311-1/+1
|/| | | | | |/ / / | | | | | | | | | | | | | | | | am: 1cc5848033 Change-Id: Ia8a70ab5aff01c18995484c83c7b4b24f86b2d32
| * / / Update PIEX am: b67d26c8dcNick Chusid2019-05-311-1/+1
|/| | | | |/ / | | | | | | | | | | | | am: 33d212717c Change-Id: I7f8b865d5c837a58980f2c7a8110e6f7a885fc0e
| * | Update PIEXNick Chusid2019-05-311-1/+1
| |\| | | | | | | | | | | | | | | | am: b67d26c8dc Change-Id: Icd161a49b33bab9cf34363407e9bf498d33c3c70
| | * Update PIEXandroid-o-mr1-iot-release-1.0.13Nick Chusid2019-05-291-1/+1
| |/ | | | | | | | | Adds minimal support for Sony A7M3 ARW by extending the range to look for a signature.
* | Revert "Mark libpiex as double_loadable" am: d054e8a2e6 am: bd44b83b9dandroid-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-releaseJooyung Han2019-03-121-1/+0
|\ \ | | | | | | | | | | | | | | | am: 1951f78f92 Change-Id: I54391b04750ef8e6741fd4943133953d01a783a8
| * | Revert "Mark libpiex as double_loadable" am: d054e8a2e6Jooyung Han2019-03-121-1/+0
| |\| | | | | | | | | | | | | | | | am: bd44b83b9d Change-Id: I215b7034babb650ab6ccddb9543bdfea3af2444b
| | * Revert "Mark libpiex as double_loadable"Jooyung Han2019-03-121-1/+0
| | |\ | | | | | | | | | | | | | | | | | | | | am: d054e8a2e6 Change-Id: Idcdbe95d5be18de47dc042eaa68286a5d01319f3
| | | * Revert "Mark libpiex as double_loadable"android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10oreo-mr1-iot-releaseJooyung Han2019-03-121-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c64563c91634c8e6c5fd2dd0b0f67315b30a170f. Reason for revert: libpiex is no longer used by libmediandk(aosp/915075). Exempt-From-Owner-Approval: revert Change-Id: I858a16f7d40613b9c433997bbd7308dcf521427b
* | | | Merge stage-aosp-master into pi-dev-plus-aospXin Li2019-02-250-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | am: dcef49e2cc Change-Id: I75b3637e093168c7dbdac92a9b579ea7c87113db
| * | | Merge stage-aosp-master into pi-dev-plus-aospXin Li2019-02-250-0/+0
| |\| | | | | | | | | | | | | | | | | | Bug: 126125118 Change-Id: Ib7b6fd3f2200e7cca0e13201435a919eaffdc2d9
| | * | DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li2019-02-200-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | Bug: 120848293 Change-Id: Ib7f5d3fc523c1643850b28723645cc3ecee6c5df
* | | | | Mark libpiex as double_loadable am: c64563c916 am: 8b7293651eJooyung Han2019-02-121-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 7b871e4ba6 Change-Id: I555802bfc0afc5184a3db4779828a9ee7403e274
| * | | | Mark libpiex as double_loadable am: c64563c916Jooyung Han2019-02-121-0/+1
| |\| | | | | |/ / | |/| | | | | | | | | | | | | | am: 8b7293651e Change-Id: Id102991d34bbccfcc285b35b55a98384b09e839b
| | * | Mark libpiex as double_loadableJooyung Han2019-02-121-0/+1
| | |\| | | | | | | | | | | | | | | | | | | | | am: c64563c916 Change-Id: If8190f83adc6f6c0b2e70c8e457a6346627df0af
| | | * Mark libpiex as double_loadableJooyung Han2019-02-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libpiex is a VNDK lib and also used by LLNDK(libmediandk) which means this lib can be double-loaded. (deps: libmediandk -> libmedia_jni -> libpiex) Bug: 121280180 Test: m -j Change-Id: Ie83ebd7e974ebc28a84855065544c10d3b81cb12
* | | | Enable libpiex for Windows am: 1ef9d0c0f4 am: 8ad5f41093Jerome Gaillard2018-11-291-0/+20
|\| | | | | | | | | | | | | | | | | | | | | | | am: 59af187624 Change-Id: Ief3e6527d63f19aa6996f3dd1621b5b6d109f322
| * | | Enable libpiex for Windows am: 1ef9d0c0f4Jerome Gaillard2018-11-291-0/+20
| |\| | | | | | | | | | | | | | | | | | | | | | am: 8ad5f41093 Change-Id: I7ebc6dc9a6be901f79039786571cea8338573f40
| | * | Enable libpiex for WindowsJerome Gaillard2018-11-291-0/+20
| | |\| | | | | | | | | | | | | | | | | | | | | am: 1ef9d0c0f4 Change-Id: I5f0dfcd3d57b6ade2480f2a3c6113e171501c84d
| | | * Enable libpiex for Windowsandroid-wear-8.0.0_r2android-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7android-n-iot-release-ihome-igv1nougat-iot-releaseJerome Gaillard2018-11-291-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed to use skia in Android Studio for Windows. Test: sdk build Change-Id: Iaf219ff802dd367a5b9679306319049590885fad
* | | | [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi2018-10-240-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE am: 4407e3338d -s ours am: 22f1ea0d3f -s ours am: 70c29ea973 -s ours Change-Id: I420fb02f3b8157d9ff779453e39a537681355be2
| * | | [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi2018-10-240-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE am: 4407e3338d -s ours am: 22f1ea0d3f -s ours Change-Id: I946ffeba3fc272e65970b119e58369c03c4289d6
| | * | [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi2018-10-240-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | am: 4407e3338d -s ours Change-Id: If42fee8e60bd771c56f3dfabaf05fa3c1ba7d538