diff options
author | Elliott Hughes <enh@google.com> | 2021-07-12 16:10:42 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-07-12 16:10:42 +0000 |
commit | a14c12e1b430f4247c1d241db28ba88502ae73fb (patch) | |
tree | 396a68a9085c6856fdb7978bf36c005eb7ba40ab | |
parent | 0001cfb01bf584942b4a8ab76e03c349b3c5bc80 (diff) | |
parent | cbcfc78b050e58f212218ba6f74cef2fe84820cf (diff) | |
download | libjpeg-turbo-a14c12e1b430f4247c1d241db28ba88502ae73fb.tar.gz |
Upgrade libjpeg-turbo to b7bef8c05b7cdb1a038ae271a2c2b6647af4c879 am: cbcfc78b05
Original change: https://android-review.googlesource.com/c/platform/external/libjpeg-turbo/+/1761049
Change-Id: I7bde4c72111bdeb0064655b2e13f675967cb498b
-rw-r--r-- | BUILD.gn | 49 | ||||
-rw-r--r-- | METADATA | 6 |
2 files changed, 19 insertions, 36 deletions
@@ -137,22 +137,15 @@ if (current_cpu == "x86" || current_cpu == "x64") { static_library("simd") { include_dirs = [ "." ] - deps = [ - ":libjpeg_headers", - ] + deps = [ ":libjpeg_headers" ] if (current_cpu == "x86") { deps += [ ":simd_asm" ] - sources = [ - "simd/i386/jsimd.c", - ] + sources = [ "simd/i386/jsimd.c" ] } else if (current_cpu == "x64") { deps += [ ":simd_asm" ] - sources = [ - "simd/x86_64/jsimd.c", - ] - } else if ((current_cpu == "arm" || current_cpu == "arm64") && - arm_use_neon) { + sources = [ "simd/x86_64/jsimd.c" ] + } else if ((current_cpu == "arm" || current_cpu == "arm64") && arm_use_neon) { include_dirs += [ "simd/arm/" ] sources = [ @@ -175,23 +168,19 @@ static_library("simd") { "simd/arm/aarch32/jchuff-neon.c", "simd/arm/aarch32/jsimd.c", ] - } else if (current_cpu == "arm64"){ + } else if (current_cpu == "arm64") { sources += [ "simd/arm/aarch64/jchuff-neon.c", "simd/arm/aarch64/jsimd.c", ] } - defines = [ - "NEON_INTRINSICS" - ] + defines = [ "NEON_INTRINSICS" ] configs -= [ "//build/config/compiler:default_optimization" ] configs += [ "//build/config/compiler:optimize_speed" ] } else { - sources = [ - "jsimd_none.c", - ] + sources = [ "jsimd_none.c" ] } if (is_win) { @@ -264,9 +253,7 @@ static_library("libjpeg") { configs += [ ":libjpeg_config" ] public_configs = [ ":libjpeg_config" ] - public_deps = [ - ":libjpeg_headers", - ] + public_deps = [ ":libjpeg_headers" ] # MemorySanitizer doesn't support assembly code, so keep it disabled in x86 # and x64 MSan builds for now. @@ -276,19 +263,19 @@ static_library("libjpeg") { public_deps += [ ":simd" ] if ((current_cpu == "arm" || current_cpu == "arm64") && arm_use_neon) { - defines += [ "NEON_INTRINSICS", ] + defines += [ "NEON_INTRINSICS" ] } } } static_library("turbojpeg") { sources = [ - "turbojpeg.c", - "transupp.c", "jdatadst-tj.c", "jdatasrc-tj.c", "rdbmp.c", "rdppm.c", + "transupp.c", + "turbojpeg.c", "wrbmp.c", "wrppm.c", ] @@ -302,9 +289,7 @@ static_library("turbojpeg") { configs += [ ":libjpeg_config" ] public_configs = [ ":libjpeg_config" ] - public_deps = [ - ":libjpeg", - ] + public_deps = [ ":libjpeg" ] } if (build_with_chromium) { @@ -326,12 +311,12 @@ if (build_with_chromium) { "jpegtran.c", "md5/md5.c", "md5/md5hl.c", - "tjbench.c", - "tjunittest.c", - "tjutil.c", "rdcolmap.c", "rdgif.c", "rdswitch.c", + "tjbench.c", + "tjunittest.c", + "tjutil.c", ] deps = [ @@ -341,9 +326,7 @@ if (build_with_chromium) { "//testing/gtest:gtest_main", ] - data = [ - "testimages/" - ] + data = [ "testimages/" ] defines = [ "GTEST", @@ -5,11 +5,11 @@ third_party { type: GIT value: "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo" } - version: "764c5fca09cb558f88f3145d67b705f92ffee2d9" + version: "b7bef8c05b7cdb1a038ae271a2c2b6647af4c879" license_type: NOTICE last_upgrade_date { year: 2021 - month: 2 - day: 9 + month: 7 + day: 8 } } |