aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-12-08Merge from Chromium at DEPS revision 39.0.2171.95android-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1lollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-releaseBen Murdoch
This commit was generated by merge_to_master.py. Change-Id: I4dede67a4a965174a937505cd21ab0f4dda446f2
2014-12-08Update makefiles after merge of Chromium at 39.0.2171.95Ben Murdoch
This commit was generated by merge_from_chromium.py. Change-Id: I527dbd784709a367e089a3a5b915dd10d116bf99
2014-09-30Merge from Chromium at DEPS revision 267aeeb8d85cPrimiano Tucci
This commit was generated by merge_to_master.py. Change-Id: Ia27e39b9cceb9f9b281266420c6d9bd5f0357746
2014-09-22Update makefiles after merge of Chromium at fb34b348eeadAndroid Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I9574eeced5bbd7ab76321b5de59d2b052814ba75
2014-09-13Merge third_party/libjpeg_turbo from ↵Android Chromium Automerger
https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git at 034e9a9747e0983bc19808ea70e469bc8342081f This commit was generated by merge_from_chromium.py. Change-Id: I42f87169a0bcae23eebac9cd6f05d3b4305149cb
2014-09-13[MIPS64] Add build support for MIPS64 in libjpeg_turbo.noel@chromium.org
BUG=400684 Review URL: https://codereview.appspot.com/143920043 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libjpeg_turbo@291962 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-09-13Update makefiles after merge of Chromium at 6a4d455b8650Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I557279c1fc3cc36ec2089c6598748c718775adea
2014-09-11Update makefiles after merge of Chromium at b62471bd5180Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I6e1f658b243f401be3556942477f696ba2da5c3c
2014-09-10Update makefiles after merge of Chromium at a301aef21f9eAndroid Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Id021bc72b59a5693136a00def584e44f7266a37a
2014-09-10Update makefiles after merge of Chromium at d0b993bb2548Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Ib1baaba6cfbca0ada72b26f4709e91ef645b3865
2014-09-09Update makefiles after merge of Chromium at facf66e09bf8Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I63adf652bf545222f47b4ba10d8707aaa96317e2
2014-09-09Update makefiles after merge of Chromium at 457b0a1c9412Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I6d20c8317d1906b6317df5436fa4cbb7790f6b23
2014-09-08Update makefiles after merge of Chromium at 02b0945c7345Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: If31153807b4186df18e69e2d824c64a5aa9de2ab
2014-09-04Merge third_party/libjpeg_turbo from ↵Android Chromium Automerger
https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git at 3963fbcd6c16965948a9c081c6e9dce82a938dad This commit was generated by merge_from_chromium.py. Change-Id: I90c851c07b8ddf7703ca38612770e3c538efe49e
2014-09-04Mark libjpeg-turbo's license as OK for android.torne@chromium.org
The custom BSD style license is compatible with Android's license requirements; mark it as such so that it can be merged to Android. BUG= R=dannyb@google.com Review URL: https://codereview.chromium.org/539063002 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libjpeg_turbo@291801 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-09-03Initial empty repositoryandroid-wear-5.1.1_r1android-wear-5.1.0_r1android-wear-5.0.0_r1android-l-preview_r2android-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1lollipop-wear-releaselollipop-releaselollipop-devlollipop-cts-releasel-previewBill Yi
2014-08-29Add ARM64 SIMD support to libjpeg_turbormcilroy@chromium.org
Cherry-picked r1108, r1109, r1333, r1375, r1386, r1389 and r1390, which add ARM64 SIMD support to libjpeg_turbo. These changes only affect ARM64 platforms (no change to other platforms or files). BUG=356100 R=noel@chromium.org Review URL: https://codereview.chromium.org/434123003 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libjpeg_turbo@291725 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-08-26libjpeg-turbo: Update README.chromium to note that a patch has been landed ↵thakis@chromium.org
upstream. TBR=cjhopman@chromium.org Review URL: https://codereview.chromium.org/506123002 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libjpeg_turbo@291651 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-08-18libjpeg-turbo: Remove .func / .endfunc directives.thakis@chromium.org
They only have an effect in -gstabs which we don't use, and clang's integrated assembler doesn't understand them. So just remove them. BUG=chromium:124610 R=cjhopman@chromium.org Review URL: https://codereview.chromium.org/481243002 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libjpeg_turbo@290390 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-08-07Add support for iOS to libjpeg.gyp.blundell@chromium.org
iOS will start pulling libjpeg_turbo in https://codereview.chromium.org/376573003/ as part of enabling initial Mojo support on iOS. To do so, iOS needs the same dependency from libjpeg_turbo to yasm as Mac does; otherwise, GYP chokes in processing libjpeg.gyp due to yasm_path being undefined. R=noel@chromium.org, rmcilroy@chromium.org Review URL: https://codereview.chromium.org//444883002 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libjpeg_turbo@288018 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-05-23Update libjpeg_turbo to use clz for bitcounting on ARMnoel@chromium.org
Cherry-picked r1220 from upstream: Use clz/bsr instructions on ARM for bit counting rather than the lookup table (reduces memory footprint and can improve performance in some cases.) Upstream review: http://sourceforge.net/p/libjpeg-turbo/patches/57/ Original review: https://codereview.appspot.com/77480045/ Removing the lookup table saves 64k data for each process that uses jpeg encoding. Benchmarks on a few ARM devices shows encoding performance changes, from a slowdown of 3-4% on some devices, to a speedup of 10-20% on other devices. In average performance improves. x86 will still use the lookup table because the bsr instruction showed to be slower on some chips. BUG= R=noel@chromium.org Review URL: https://codereview.appspot.com/97690043 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libjpeg_turbo@272637 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-04-14Upgrade libjpeg_turbo to 1.3.1 (r1219)noel@chromium.org
Remove google.jdmarker.patch, since the fixes for CVE-2013-6629 and CVE-2013-6630 are upstream most everywhere now [1]. Version number to 1.3.1 (config.h, jconfig.h). README.chromium: "Fixed valgrind error" patch was upstreamed in r839 http://sourceforge.net/p/libjpeg-turbo/code/839. The r1188 cherry-pick was put in config.h, say that. [1] http://seclists.org/fulldisclosure/2013/Nov/83 TBR=darin@chromium.org BUG=258723, 299835 Review URL: https://codereview.appspot.com/87110044 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libjpeg_turbo@263594 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-04-12Remove unsued win/jconfig.h filenoel@chromium.org
The win build does not use win/jconfig.h at all; no gyp files refers to it (all builds use the jconfig.h in third_pary/libjpeg_turbo dir) so remove this file. TBR=darin@chromium.org TEST=compile win chrome NOTRY=true BUG=None Review URL: https://codereview.appspot.com/87270043 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libjpeg_turbo@263496 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-04-02Fix warning about always_inline attribute in libjpeg_turbo.rmcilroy@chromium.org
GCC 4.7/4.8 warns when __attribute__((always_inline)) is used without a normal 'inline' keyword. Pull an equivalent of upstream r1188 to avoid this warning. R=rmcilroy@chromium.org, phajdan.jr@chromium.org Review URL: https://codereview.chromium.org/218733003 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libjpeg_turbo@261103 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-03-27Stop using "prefix_dir" in libjpeg.gyp.raphael.kubo.da.costa@intel.com
This reverts part of r257324: prefix_dir is a variable defined only by FreeBSD's Chromium packaging code and should not be used here upstream. R=rmcilroy@chromium.org, phajdan.jr, rmcilroy Review URL: https://codereview.chromium.org/214413007 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libjpeg_turbo@259851 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-03-26Add target_arch=arm64 support.rmcilroy@chromium.org
Currently only adding jsimd_none.c to get things building. BUG=354405 R=wangxianzhu@chromium.org Review URL: https://codereview.chromium.org/210933002 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libjpeg_turbo@259566 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-03-15Allow libjpeg_turbo to configure (using gyp) on FreeBSD.raphael.kubo.da.costa@intel.com
Allow both the built-in and system yasm on FreeBSD, and add (prefix_dir)/include to the include path. Obtained from: George Liaskos <geo.liaskos@gmail.com> BUG= R=phajdan.jr@chromium.org TBR=cpu@chromium.org Review URL: https://codereview.appspot.com/56740043 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libjpeg_turbo@257324 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-02-18Disable assembly optimizations in MemorySanitizer builds of libjpeg_turbo.earthdok@chromium.org
BUG=chromium:178409 NOTRY=true Review URL: https://codereview.chromium.org/170323002 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libjpeg_turbo@251747 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2013-12-09Revert the previous 2 temporary changes.wangxianzhu@chromium.org
Reverted r239283 (Temporary limit NO_GETENV on Android only) and r239591 (Temporary revert "update neon config in libjpeg turbo". Will roll m32 libjpeg_turbo to r239591. BUG=322228 TBR= Review URL: https://codereview.chromium.org/108273007 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libjpeg_turbo@239595 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2013-12-09Temporarily revert "update neon config in libjpeg turbo"wangxianzhu@chromium.org
This is for rolling the NO_GETENV change into m32. Will revert this change asap after it is submitted. This reverts commit 9652949c7866f976393848990dbebbd873f5f43f. BUG=322228 TBR= Review URL: https://codereview.chromium.org/110853003 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libjpeg_turbo@239591 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2013-12-09Temporary limit NO_GETENV on Android onlywangxianzhu@chromium.org
This is for rolling the NO_GETENV change on Android only into m32. Will revert this change immediately after this change is submitted. BUG=322228 R=klobag@chromium.org Review URL: https://codereview.chromium.org/110163003 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libjpeg_turbo@239583 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2013-12-03update neon config in libjpeg turbo thakis@chromium.org
This patch upgrades the neon config for libjpeg_turbo: use arm_version instead of armv7, and respect arm_neon_optional. BUG=234135 Review URL: https://codereview.chromium.org/95883002/ Patch from Mostyn Bramley-Moore <mostynb@opera.com>! git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libjpeg_turbo@238478 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2013-12-02Disable libjpeg turbo getenv()wangxianzhu@chromium.org
getenv() is used in libjpeg_turbo to get environment variable JPEGMEM which overrides the default max_memory setting from jpeg_mem_init. However, getenv() is not thread-safe. Now libjpeg may be called from multiple threads when impl-side-painting is enabled. BUG=322228 R=noel@chromium.org Committed: 8692fb5 Review URL: https://codereview.chromium.org/100293002 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libjpeg_turbo@238232 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2013-10-13Zero unused DHT huffman values at creation timenoel@chromium.org
TBR=darin@chromium.org BUG=299835 Review URL: https://codereview.chromium.org/27120002 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libjpeg_turbo@228394 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2013-10-13Better handle SOS CSi values and ordernoel@chromium.org
Image SOS CSi markers should be distinct. Enforce that constraint when reading multiple CSi values in get_sos(). TBR=darin@chromium.org BUG=258723 Review URL: https://codereview.chromium.org/27117002 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libjpeg_turbo@228381 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2013-01-18Remove <(library) usage from libjpeg.gyp.tfarina@chromium.org
BUG=111541 R=steveblock@chromium.org Review URL: https://codereview.chromium.org/12021017 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libjpeg_turbo@177737 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-08-01Make 'License' field in third-party metadata requiredsteveblock@chromium.org
This will simplify the addition of a tool to check licenses for the purpose of the Android WebView build. See also http://codereview.chromium.org/10821103. BUG=138921 Review URL: https://chromiumcodereview.appspot.com/10827099 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libjpeg_turbo@149334 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-07-19Remove logic for using system libjpeg from libjpeg_turbo gyp filesteveblock@chromium.org
This is part of simplifying gyp logic for libjpeg. See http://codereview.chromium.org/10696082. Review URL: https://chromiumcodereview.appspot.com/10777011 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libjpeg_turbo@147428 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-07-19Update libjpeg-turbo to r856.hbono@chromium.org
BUG=132952 TEST=none Review URL: https://chromiumcodereview.appspot.com/10700197 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libjpeg_turbo@147403 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-06-28[MIPS] Add build support for libjpeg_turbo for MIPS.hbono@chromium.org
Minimal change to libjpeg.gyp to enable succssesful build of libjpeg_turbo for MIPS architecture. TBR=petarj@mips.com, BUG=130022 TEST=make chrome The original change has been created by Petar Jovanovic <petarj@mips.com>. Review URL: https://chromiumcodereview.appspot.com/10699020 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libjpeg_turbo@144658 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-06-27arm: Always build the NEON SIMD code when targetting ARMv7-A devices.hbono@chromium.org
The libjpeg_turbo library only uses the NEON SIMD code path when it determines at runtime that the CPU supports it. Always enable it when targetting ARMv7-A devices. Tested on a Motorola Xoom (Tegra2, thus no Neon) and on a Nexus S (supports Neon). Benchmarking shows a x1.48 decoding performance improvement on the Nexus S, and x1.09 on a Galaxy Nexus. BUG= TEST= The original change is created by digit@chromium.org. Review URL: https://chromiumcodereview.appspot.com/10702002 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libjpeg_turbo@144411 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-05-31Make the default to not use system lib for all buildshbono@chromium.org
The original change is <http://codereview.chromium.org/10442041/>, which is created by davemoore@chromium.org. TBR=davemoore BUG=None TEST=None Review URL: https://chromiumcodereview.appspot.com/10459046 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libjpeg_turbo@139754 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-05-30Pull in r830 from upstream.cevans@chromium.org
BUG=130240 Review URL: https://chromiumcodereview.appspot.com/10459034 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libjpeg_turbo@139642 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-05-11Update libjpeg-turbo.hbono@chromium.org
This change updates our copy of libjpeg-turbo to r829. BUG=none TEST=none Review URL: https://chromiumcodereview.appspot.com/10386084 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libjpeg_turbo@136524 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-04-27enable libjpeg for chromium x86 android buildwistoch@gmail.com
Review URL: http://codereview.chromium.org/10234002 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libjpeg_turbo@134206 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-04-06add 64 bit gyp builds for OSX and Windows.fbarchard@google.com
BUG=none TEST=none Review URL: https://chromiumcodereview.appspot.com/9982017 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libjpeg_turbo@131206 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-03-12Revert r124240.thakis@chromium.org
I fixed yasm to no longer emit this warning, see http://tortall.lighthouseapp.com/projects/78676-yasm/tickets/246 Review URL: https://chromiumcodereview.appspot.com/9666044 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libjpeg_turbo@126090 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-03-01Build fix for linux32 after my last change to this file.thakis@chromium.org
TBR=vandebo Review URL: https://chromiumcodereview.appspot.com/9560006 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libjpeg_turbo@124297 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-02-29libjpeg_turbo: Filter out "section flags ignored on section redeclaration" ↵thakis@chromium.org
warnings on mac. This removes over 50 lines of warning output when doing a clobber build on mac. Thanks to mark@ for telling me how to get >() process substitution work with gyp. Review URL: https://chromiumcodereview.appspot.com/9533003 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libjpeg_turbo@124240 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-01-31JPEG_DECODE_ONLY macro reintroduced to allow just the decode functions to be ↵fbarchard@chromium.org
linked in BUG=none TEST=none Review URL: https://chromiumcodereview.appspot.com/9317003 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libjpeg_turbo@119959 4ff67af0-8c30-449e-8e8b-ad334ec8d88c