diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-02-28 03:07:33 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-02-28 03:07:33 +0000 |
| commit | 63487796abb590ede014a5b9673d5d0759535542 (patch) | |
| tree | 1c4709daa2f046b008d39bfeac1de1a1b2db5a04 | |
| parent | eb7dfbd5542cbb2c03d0d675bcffddd595fa63ef (diff) | |
| parent | f8594b440921e05238b9cb7879919fd2d3405782 (diff) | |
| download | ImageMagick-android-vts-11.0_r10.tar.gz | |
Snap for 6245507 from f8594b440921e05238b9cb7879919fd2d3405782 to rvc-releaseandroid-vts-11.0_r9android-vts-11.0_r8android-vts-11.0_r7android-vts-11.0_r6android-vts-11.0_r5android-vts-11.0_r4android-vts-11.0_r3android-vts-11.0_r2android-vts-11.0_r16android-vts-11.0_r15android-vts-11.0_r14android-vts-11.0_r13android-vts-11.0_r12android-vts-11.0_r11android-vts-11.0_r10android-vts-11.0_r1android-security-11.0.0_r76android-security-11.0.0_r75android-security-11.0.0_r74android-security-11.0.0_r73android-security-11.0.0_r72android-security-11.0.0_r71android-security-11.0.0_r70android-security-11.0.0_r69android-security-11.0.0_r68android-security-11.0.0_r67android-security-11.0.0_r66android-security-11.0.0_r65android-security-11.0.0_r64android-security-11.0.0_r63android-security-11.0.0_r62android-security-11.0.0_r61android-security-11.0.0_r60android-security-11.0.0_r59android-security-11.0.0_r58android-security-11.0.0_r57android-security-11.0.0_r56android-security-11.0.0_r55android-security-11.0.0_r54android-security-11.0.0_r53android-security-11.0.0_r52android-security-11.0.0_r51android-security-11.0.0_r50android-security-11.0.0_r49android-security-11.0.0_r1android-cts-11.0_r9android-cts-11.0_r8android-cts-11.0_r7android-cts-11.0_r6android-cts-11.0_r5android-cts-11.0_r4android-cts-11.0_r3android-cts-11.0_r2android-cts-11.0_r16android-cts-11.0_r15android-cts-11.0_r14android-cts-11.0_r13android-cts-11.0_r12android-cts-11.0_r11android-cts-11.0_r10android-cts-11.0_r1android-11.0.0_r5android-11.0.0_r4android-11.0.0_r3android-11.0.0_r25android-11.0.0_r2android-11.0.0_r17android-11.0.0_r1android11-tests-releaseandroid11-security-releaseandroid11-s1-releaseandroid11-release
Change-Id: I9323cd8d1401e10d7424a8b571c332bb85ed046e
| -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) |