diff options
| author | Elliott Hughes <enh@google.com> | 2020-12-02 18:09:57 -0800 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2020-12-02 18:24:38 -0800 |
| commit | 98e581f8227b9846b7adc92c0c63f5ed2384ff4b (patch) | |
| tree | 26effec72dbace7671158aeddc9fde1e3e9cd1a9 /Android.bp | |
| parent | ff78ee5a324a7d37e0bfffd6152ea37056f29931 (diff) | |
| parent | d5148db386ceb4a608058320071cbed890bd6ad2 (diff) | |
Switch to chromium upstream.
Bug: https://issuetracker.google.com/135180511
Test: treehugger
Change-Id: I0c78ec9b07debdb501a96df0d6cb2f9a24b5fc84
Diffstat (limited to 'Android.bp')
| -rw-r--r-- | Android.bp | 41 |
1 files changed, 36 insertions, 5 deletions
@@ -3,6 +3,9 @@ cc_defaults { name: "libjpeg-defaults", cflags: [ + "-DWITH_SIMD", + "-DNO_GETENV", + "-O3", "-fstrict-aliasing", @@ -19,6 +22,7 @@ cc_defaults { "jccolor.c", "jcdctmgr.c", "jchuff.c", + "jcicc.c", "jcinit.c", "jcmainct.c", "jcmarker.c", @@ -38,6 +42,7 @@ cc_defaults { "jdcolor.c", "jddctmgr.c", "jdhuff.c", + "jdicc.c", "jdinput.c", "jdmainct.c", "jdmarker.c", @@ -57,6 +62,7 @@ cc_defaults { "jidctred.c", "jmemmgr.c", "jmemnobs.c", + "jpeg_nbits_table.c", "jquant1.c", "jquant2.c", "jutils.c", @@ -72,15 +78,39 @@ cc_defaults { instruction_set: "arm", // ARM v7 NEON srcs: [ - "simd/arm/jsimd.c", - "simd/arm/jsimd_neon.S", + "simd/arm/arm/jsimd.c", + "simd/arm/arm/jsimd_neon.S", + "simd/arm/common/jccolor-neon.c", + "simd/arm/common/jcgray-neon.c", + "simd/arm/common/jcsample-neon.c", + "simd/arm/common/jdcolor-neon.c", + "simd/arm/common/jdmerge-neon.c", + "simd/arm/common/jdsample-neon.c", + "simd/arm/common/jfdctfst-neon.c", + "simd/arm/common/jfdctint-neon.c", + "simd/arm/common/jidctfst-neon.c", + "simd/arm/common/jidctint-neon.c", + "simd/arm/common/jidctred-neon.c", + "simd/arm/common/jquanti-neon.c", ], }, arm64: { // ARM v8 64-bit NEON srcs: [ - "simd/arm64/jsimd.c", - "simd/arm64/jsimd_neon.S", + "simd/arm/arm64/jsimd.c", + "simd/arm/arm64/jsimd_neon.S", + "simd/arm/common/jccolor-neon.c", + "simd/arm/common/jcgray-neon.c", + "simd/arm/common/jcsample-neon.c", + "simd/arm/common/jdcolor-neon.c", + "simd/arm/common/jdmerge-neon.c", + "simd/arm/common/jdsample-neon.c", + "simd/arm/common/jfdctfst-neon.c", + "simd/arm/common/jfdctint-neon.c", + "simd/arm/common/jidctfst-neon.c", + "simd/arm/common/jidctint-neon.c", + "simd/arm/common/jidctred-neon.c", + "simd/arm/common/jquanti-neon.c", ], }, x86: { @@ -134,6 +164,7 @@ cc_defaults { ], asflags: [ "-DPIC", + "-D__x86__", ], local_include_dirs: [ "simd", @@ -207,7 +238,7 @@ cc_defaults { }, } -// Also build as a shared library. +// Build as a shared library. cc_library { name: "libjpeg", host_supported: true, |