diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-28 00:49:11 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-28 00:49:11 +0000 |
| commit | 58f819a4c84b945f0f098b51301698bc6af5d6da (patch) | |
| tree | 1c4709daa2f046b008d39bfeac1de1a1b2db5a04 | |
| parent | 03366e9f07b20a86f87a2a40c6208f6c2fcd4daf (diff) | |
| parent | f8594b440921e05238b9cb7879919fd2d3405782 (diff) | |
| download | ImageMagick-58f819a4c84b945f0f098b51301698bc6af5d6da.tar.gz | |
resolve merge conflicts of 2b5c0a93a867c6f46ba32ea89c1f7aef8ed44d38 to rvc-dev am: f8594b4409android-11.0.0_r16android11-d1-b-release
Change-Id: Ib5cedd0e007c93fdf4beda257ef1efbf044f6599
| -rw-r--r-- | coders/Android.bp | 2 | ||||
| -rw-r--r-- | coders/coders-list.h | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/coders/Android.bp b/coders/Android.bp index 1db6067b1..7235d2a22 100644 --- a/coders/Android.bp +++ b/coders/Android.bp @@ -17,7 +17,7 @@ cc_library_static { sdk_version: "24", - srcs: ["jpeg.c"], + srcs: ["dds.c", "jpeg.c", "xc.c"], cflags: ["-DHAVE_CONFIG_H"], diff --git a/coders/coders-list.h b/coders/coders-list.h index b3ec0d256..634559392 100644 --- a/coders/coders-list.h +++ b/coders/coders-list.h @@ -14,7 +14,11 @@ limitations under the License. */ -#if 0 +#if defined(__ANDROID__) +AddMagickCoder(DDS) +AddMagickCoder(JPEG) +AddMagickCoder(XC) +#else AddMagickCoder(AAI) AddMagickCoder(ART) AddMagickCoder(AVS) @@ -86,11 +90,9 @@ AddMagickCoder(JNX) #if defined(MAGICKCORE_JP2_DELEGATE) || defined(MAGICKCORE_LIBOPENJP2_DELEGATE) AddMagickCoder(JP2) #endif -#endif #if defined(MAGICKCORE_JPEG_DELEGATE) AddMagickCoder(JPEG) #endif -#if 0 AddMagickCoder(JSON) #if defined(MAGICKCORE_JXL_DELEGATE) AddMagickCoder(JXL) |