commit 46696775cff41245ab4a23a7c89f6d399543852c
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Feb 28 01:04:07 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Feb 28 01:04:07 2020 +0000
tree 1c4709daa2f046b008d39bfeac1de1a1b2db5a04
parent 03366e9f07b20a86f87a2a40c6208f6c2fcd4daf
parent 58f819a4c84b945f0f098b51301698bc6af5d6da

resolve merge conflicts of 2b5c0a93a867c6f46ba32ea89c1f7aef8ed44d38 to rvc-dev am: f8594b4409 am: 58f819a4c8

Change-Id: Ifcdd98346cfec91a3506f96896140b40c8e5953b

coders/Android.bp

diff --git a/coders/Android.bp b/coders/Android.bp
index 1db6067..7235d2a 100644
--- a/coders/Android.bp
+++ b/coders/Android.bp
@@ -17,7 +17,7 @@
 
     sdk_version: "24",
 
-    srcs: ["jpeg.c"],
+    srcs: ["dds.c", "jpeg.c", "xc.c"],
 
     cflags: ["-DHAVE_CONFIG_H"],
 

coders/coders-list.h

diff --git a/coders/coders-list.h b/coders/coders-list.h
index b3ec0d2..6345593 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 @@
 #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)