diff options
| author | Haibo Huang <hhb@google.com> | 2020-02-27 23:34:24 +0000 |
|---|---|---|
| committer | Haibo Huang <hhb@google.com> | 2020-02-27 15:41:13 -0800 |
| commit | f8594b440921e05238b9cb7879919fd2d3405782 (patch) | |
| tree | 1c4709daa2f046b008d39bfeac1de1a1b2db5a04 | |
| parent | 03366e9f07b20a86f87a2a40c6208f6c2fcd4daf (diff) | |
| parent | 2b5c0a93a867c6f46ba32ea89c1f7aef8ed44d38 (diff) | |
| download | ImageMagick-android11-mainline-cellbroadcast-release.tar.gz | |
resolve merge conflicts of 2b5c0a93a867c6f46ba32ea89c1f7aef8ed44d38 to rvc-devandroid-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android11-mainline-tethering-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-dev
Bug: 136733674
Change-Id: Ibb3eca17609977b576cc8b79218976653b32aa18
| -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) |