aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-05-08Snap for 7347062 from 06019da7aff21ecabba0fe2a85b50c35fca19efd to sc-d1-releaseandroid-12.0.0_r7android-12.0.0_r6android-12.0.0_r5android-12.0.0_r4android-12.0.0_r15android-12.0.0_r14android-12.0.0_r13android-12.0.0_r12android12-d1-s6-releaseandroid12-d1-s5-releaseandroid12-d1-s4-releaseandroid12-d1-s3-releaseandroid12-d1-s2-releaseandroid12-d1-s1-releaseandroid12-d1-releaseandroid-build-team Robot
Change-Id: I76dfaa9cdbf5580aa3d9cfc18da9183e59f754f4
2021-05-07Merge remote-tracking branch 'aosp/upstream-master' into update am: ↵android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-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-devandroid12-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-devElliott Hughes
7f20a9f452 am: 9d8464a28f am: 7d3c5265cd Original change: https://android-review.googlesource.com/c/platform/external/libjpeg-turbo/+/1698875 Change-Id: I3d29e662b4fddb3852a8d1e278cb14677cd29ab2
2021-05-07Merge remote-tracking branch 'aosp/upstream-master' into update am: ↵Elliott Hughes
7f20a9f452 am: 9d8464a28f Original change: https://android-review.googlesource.com/c/platform/external/libjpeg-turbo/+/1698875 Change-Id: Ib1bc40b13cacca675e0257f24f57f845d8e5e3dc
2021-05-07Merge remote-tracking branch 'aosp/upstream-master' into update am: 7f20a9f452Elliott Hughes
Original change: https://android-review.googlesource.com/c/platform/external/libjpeg-turbo/+/1698875 Change-Id: I737349acc9cc05957db7530a2b85d2ed66a77147
2021-05-06Merge remote-tracking branch 'aosp/upstream-master' into updateandroid-s-beta-2android-s-beta-1Elliott Hughes
Change-Id: Ifec62ddc0503763d3534b5459559a0ba22ea4311
2021-05-06Add ifdef for jpeglibmanglerLeon Scroggins III
Bug: b/184745328 Only include jpeglibmangler when a new flag (MANGLE_JPEG_NAMES) is defined. Define the flag in BUILD.gn. This will allow the Android platform to sync to this version, not define the flag in its own build files, and properly exclude jpeglibmangler.h. Change-Id: I510b4abde046172f2b96c09a23481404402d2217
2021-04-26Update libjpeg-turbo to stable release 2.1.0Jonathan Wright
Update Chromium's copy of libjpeg-turbo to the latest upstream stable release (v2.1.0) and re-apply our local changes documented in README.chromium. This upstream release fixes a long-standing libjpeg6b compatability issue[1] meaning we can dispense with the locally-applied workaround. [1] http://crbug.com/398235 Change-Id: Icae6741f49d4ae8bc12ccfcbef416fb6a6fa16f1
2021-04-08Snap for 7266202 from d63e28da1fa6d8de00a9f3ae539778667017f11a to sc-d1-releaseandroid-build-team Robot
Change-Id: I2310c3e95f50ae2898f06d87219b5c1452c1c04f
2021-04-07Revert "Upgrade libjpeg-turbo to 7b4981b6500ccba10733c352b9ed2dad14ce3c73" ↵Elliott Hughes
am: c913ecddcc am: bc377bb56e am: 1f2bdec49f Original change: https://android-review.googlesource.com/c/platform/external/libjpeg-turbo/+/1665307 Change-Id: Icf2159c687bfad1d240c6b6525878c25966a868e
2021-04-07Revert "Upgrade libjpeg-turbo to 7b4981b6500ccba10733c352b9ed2dad14ce3c73" ↵temp_ab_7272582Elliott Hughes
am: c913ecddcc am: bc377bb56e Original change: https://android-review.googlesource.com/c/platform/external/libjpeg-turbo/+/1665307 Change-Id: I057a29cfc3d44e80e76bbfa6812d60866a412308
2021-04-07Revert "Upgrade libjpeg-turbo to 7b4981b6500ccba10733c352b9ed2dad14ce3c73" ↵Elliott Hughes
am: c913ecddcc Original change: https://android-review.googlesource.com/c/platform/external/libjpeg-turbo/+/1665307 Change-Id: I8cac253ef47747e15c934e5d95bc59d899dbf9df
2021-04-06Revert "Upgrade libjpeg-turbo to 7b4981b6500ccba10733c352b9ed2dad14ce3c73"Elliott Hughes
This reverts commit ef1727bef4eecad06346a0ec0e72c59eccad2a03. Bug: https://issuetracker.google.com/184608251 Reason for revert: vendor code was depending on the renamed symbols Test: treehugger Change-Id: I24b06df23b3ff658d3a94ef295425a30185c232b
2021-04-03Snap for 7256110 from dd6969c82e19edca3663c04f1b471f5ddc09ae9d to sc-d1-releaseandroid-build-team Robot
Change-Id: I021dda27f67a3125b4677940725dc9f7d70ece87
2021-04-02Upgrade libjpeg-turbo to 7b4981b6500ccba10733c352b9ed2dad14ce3c73 am: ↵Elliott Hughes
ef1727bef4 am: 77e8e10ef6 am: 5ca56a72f5 Original change: https://android-review.googlesource.com/c/platform/external/libjpeg-turbo/+/1662592 Change-Id: Ie6d37940fe842bcbc271a24912b14eae1a5c69d7
2021-04-02Upgrade libjpeg-turbo to 7b4981b6500ccba10733c352b9ed2dad14ce3c73 am: ↵Elliott Hughes
ef1727bef4 am: 77e8e10ef6 Original change: https://android-review.googlesource.com/c/platform/external/libjpeg-turbo/+/1662592 Change-Id: I792d05869ab3f519b5caea0254cf72fb90c8293c
2021-04-02Upgrade libjpeg-turbo to 7b4981b6500ccba10733c352b9ed2dad14ce3c73 am: ef1727bef4Elliott Hughes
Original change: https://android-review.googlesource.com/c/platform/external/libjpeg-turbo/+/1662592 Change-Id: I68b7bb83511a6c06a64452d5802f71c013a0b1f2
2021-04-01Upgrade libjpeg-turbo to 7b4981b6500ccba10733c352b9ed2dad14ce3c73Elliott Hughes
Test: make Change-Id: Ifd70138c12414cd76b2550862502c8b3ac8d45a1
2021-02-23Include jpeglibmangler.hKeiichi Enomoto
The previous change bbb8282 unintentionally removed lines to include jpeglibmangler.h and it broke the build flag named use_system_libjpeg. This change rewinds removed lines to fix the issue. Change-Id: I22e258e3815cdacc4a7e03571ee8f73d7a07dfb5
2021-02-21Snap for 7160059 from b5f66a384a650d729d43ce66ac46d6d89b8a1f3c to sc-d1-releaseandroid-build-team Robot
Change-Id: Ic8fe4003e7338a608dd8ca1b7cde9c464cbfc7f2
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: ed62c07bc3 -s ↵Xin Li
ours am: 091dab90fb -s ours am skip reason: Change-Id I92781013edcac141916d8d51544e317bdf394174 with SHA-1 f63b7e5d3e is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0fc548510bc58014123dd02fe0cdb237537a186e
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: ed62c07bc3 -s oursXin Li
am skip reason: Change-Id I92781013edcac141916d8d51544e317bdf394174 with SHA-1 f63b7e5d3e is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9ec2e3b95c6765fc198328f4988de142bef9bbcc
2021-02-20Mark ab/7061308 as merged in stage.Xin Li
Bug: 180401296 Merged-In: I92781013edcac141916d8d51544e317bdf394174 Change-Id: I50140984174478a9275b6055eefc7496b691a4f6
2021-02-18Snap for 7152399 from 6f8a54f7cf82c365a2efa8ddab9ec2f0f211827b to sc-d1-releaseandroid-build-team Robot
Change-Id: Ia81da6eec8d49ef5a247496dd3f5e4901c113228
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/libjpeg-turbo am: 51ea790e2e am: ↵Bob Badour
5c7500dfa0 am: b207bac3dc Original change: https://android-review.googlesource.com/c/platform/external/libjpeg-turbo/+/1587909 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Icdd5760b364fc3258f1f35a316de71e519f60f18
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/libjpeg-turbo am: 51ea790e2e am: ↵Bob Badour
5c7500dfa0 Original change: https://android-review.googlesource.com/c/platform/external/libjpeg-turbo/+/1587909 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7f821ec312bfc90554bddbb0406b2a4cced2cebf
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/libjpeg-turbo am: 51ea790e2eBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/libjpeg-turbo/+/1587909 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I62d06a8475e1678f25f4f1e5fa2a350b53603bcd
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/libjpeg-turboandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-BSD SPDX-license-identifier-Beerware SPDX-license-identifier-MIT SPDX-license-identifier-Zlib legacy_notice legacy_unencumbered to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Ia34449c3b9cf777bf70afb1036034128c64e038c
2021-02-12Snap for 7140885 from 7aa49ee8c9811e8f3e2bf297d12c5df9660ce12c to sc-d1-releaseandroid-build-team Robot
Change-Id: If9fae064804d8fc2385a717f73947451be205400
2021-02-10Upgrade libjpeg-turbo to 07a7d24ba3c91fa695d4f2b65f0788c0c80c7928 am: ↵Haibo Huang
561da2822f am: 0fa937cf01 am: 04c9ddd1a8 Original change: https://android-review.googlesource.com/c/platform/external/libjpeg-turbo/+/1582228 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iea763ea869c70054c8d6423201aab4cbdb9d0d3b
2021-02-10Upgrade libjpeg-turbo to 07a7d24ba3c91fa695d4f2b65f0788c0c80c7928 am: ↵Haibo Huang
561da2822f am: 0fa937cf01 Original change: https://android-review.googlesource.com/c/platform/external/libjpeg-turbo/+/1582228 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8c3eed5314334f944af29f8affb2303df0d26212
2021-02-10Upgrade libjpeg-turbo to 07a7d24ba3c91fa695d4f2b65f0788c0c80c7928 am: 561da2822fHaibo Huang
Original change: https://android-review.googlesource.com/c/platform/external/libjpeg-turbo/+/1582228 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I89f15171623b4d6f6c5697b5f4f697a6888acecb
2021-02-09Upgrade libjpeg-turbo to 07a7d24ba3c91fa695d4f2b65f0788c0c80c7928Haibo Huang
Test: make Change-Id: Ie9d53e06f88a07f7b2b9caaa080ef3f617850c99
2021-02-02Move metadata in OWNERS files to DIR_METADATA filesEdward Lesmes
Bug: 1113033 Change-Id: I819a3c6c5337fe9183a4012d0df42bf023235a71
2021-01-30Snap for 7112378 from 80dea9fe815a3098e509e5b8aee654255aad95d6 to sc-d1-releaseandroid-build-team Robot
Change-Id: I160cd6b725c71a052a7e38aab34a1c5b2af53d4b
2021-01-29Upgrade libjpeg-turbo to fa0de07678c9828cc57b3eb086c03771912ba527 am: ↵Haibo Huang
f7bb80dc5e am: 4f66d2ef51 am: 71852861f1 Original change: https://android-review.googlesource.com/c/platform/external/libjpeg-turbo/+/1564663 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I01ee4e62718b552477335c37c79a4f93d316a8ad
2021-01-29Upgrade libjpeg-turbo to fa0de07678c9828cc57b3eb086c03771912ba527 am: ↵Haibo Huang
f7bb80dc5e am: 4f66d2ef51 Original change: https://android-review.googlesource.com/c/platform/external/libjpeg-turbo/+/1564663 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib53a7fea651c8b54cdfa4e5bfe6c30bf4784c2a6
2021-01-29Upgrade libjpeg-turbo to fa0de07678c9828cc57b3eb086c03771912ba527 am: f7bb80dc5eHaibo Huang
Original change: https://android-review.googlesource.com/c/platform/external/libjpeg-turbo/+/1564663 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I424422f737af06937feb673d3b347353f35e7460
2021-01-28Upgrade libjpeg-turbo to fa0de07678c9828cc57b3eb086c03771912ba527Haibo Huang
Test: make Change-Id: I5de273521ea963ae8720779874e9796e94433cd9
2021-01-18Add Arm Neon SIMD paths to MSan buildsJonathan Wright
MSan does not support assembly code so all SIMD paths were disabled for MSan builds of libjpeg-turbo. Now that all Arm Neon SIMD paths are implemented using intrinsics (and all assembly code has been removed) we can enable these paths for MSan builds. Change-Id: Id244fa2f710d6647a20f2a0d1c6760813623b0cf
2021-01-18Tidy up BUILD.gn fileJonathan Wright
Simplify conditions to use Arm Neon sources and reduce duplication for AArch64 and AArch32 Neon builds. Change-Id: I8c1f8547741db3ccc6db20e6fef9a73ca49db6d3
2021-01-12Cherry-pick Arm CLZ fixes from upstreamJonathan Wright
Cherry-pick two patches from upstream that fix the Neon intrinsics Huffman encoding path and reduce the memory footprint on Windows on Arm: https://github.com/libjpeg-turbo/libjpeg-turbo/commit/d2c407995992be1f128704ae2479adfd7906c158 https://github.com/libjpeg-turbo/libjpeg-turbo/commit/74e6ea45e3547ae85cd43efcdfc24a6907a2154e Re-enable the Neon intrinsics Huffman encoding path for WoA compiled with clang-cl. Bug: 1160249 Change-Id: I0849ca54b8f4f8f38c9b293ea48c9de1c60be86f
2021-01-07Snap for 7066998 from 4a15aa96eba4db5b6660553b30bb8f2e2569f5e9 to sc-d1-releaseandroid-build-team Robot
Change-Id: Ie5898e69b7f38395a8a00f1e20dec6712b630614
2021-01-06Upgrade libjpeg-turbo to 09efc26aff7983f4377a1743a197ca3d74796d7d am: ↵Haibo Huang
8091842bf9 am: 3bd8f29b22 am: 7c68183fa9 Original change: https://android-review.googlesource.com/c/platform/external/libjpeg-turbo/+/1534067 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I925e423227c89b19c75cd395eff7bf9a73e5df1b
2021-01-06Upgrade libjpeg-turbo to 09efc26aff7983f4377a1743a197ca3d74796d7d am: ↵Haibo Huang
8091842bf9 am: 3bd8f29b22 Original change: https://android-review.googlesource.com/c/platform/external/libjpeg-turbo/+/1534067 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0a3f8f9c98038d5d0922cbadeeaae4ca9bc480d5
2021-01-06Upgrade libjpeg-turbo to 09efc26aff7983f4377a1743a197ca3d74796d7d am: 8091842bf9Haibo Huang
Original change: https://android-review.googlesource.com/c/platform/external/libjpeg-turbo/+/1534067 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4aebdc3d8a8e03fdf65f26732331bb5cb8b42924
2020-12-29Upgrade libjpeg-turbo to 09efc26aff7983f4377a1743a197ca3d74796d7dHaibo Huang
Test: make Change-Id: I81d381e5dcef8a1169021ca75ddf2cb6d505affd
2020-12-18Disable Neon Huffman encoding for WoA/Clang-clJonathan Wright
The Neon SIMD path for Huffman encoding (baseline, not progressive) does not work properly when compiled for Windows on Arm (WoA) using Clang-cl. For now - as the cause of the problem is not trivial to diagnose or fix - disable the Neon Huffman encoding path when compiling for WoA using Clang-cl. Bug: 1160249 Change-Id: I6381cbe8cabc218ab6541f2b64fa07b9a83fcd12
2020-12-11Snap for 7026311 from 83423976bcac8cbd7e56ee1cf388ad3c9f32ac22 to sc-d1-releaseandroid-build-team Robot
Change-Id: I7191f008ddb316566c9562a94e9b1f0b5d308f73
2020-12-10Upgrade libjpeg-turbo to e9a659a09e9600883e499c06ede04ba514d7f942 am: ↵Elliott Hughes
bbc7c083b0 am: a5fac4b8fe am: f63b7e5d3e Original change: https://android-review.googlesource.com/c/platform/external/libjpeg-turbo/+/1522441 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5af7060f52c527a4697f7416a98bdaba793c8696
2020-12-10Upgrade libjpeg-turbo to e9a659a09e9600883e499c06ede04ba514d7f942 am: ↵Elliott Hughes
bbc7c083b0 am: a5fac4b8fe Original change: https://android-review.googlesource.com/c/platform/external/libjpeg-turbo/+/1522441 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I92781013edcac141916d8d51544e317bdf394174
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-10 17:09:27 +0000