ImageMagick: only build the jpeg coder.
The sole user of ImageMagick (the legacy wallpapers) only needs jpeg, so
let's get out of the business of supporting every other format known to
man.
Test: wallpaper app still works on taimen
Change-Id: I7c5673a90aec445c6e03c3557aec4dc780f8df0a
ImageMagick: have DDS and XC coders added
The user of ImageMagick (the legacy wallpapers) needs DDS and XC coders.
Also move the Android-specific list of coders to the top of
coders-list.h to avoid merge conflicts.
Test: wallpaper should run in walleye
Change-Id: If8915d51ac2f3e7a4427241e5dfbe52a2f5b5447
Bug: 136733674
diff --git a/coders/Android.bp b/coders/Android.bp
index 09e20e5..6e27324 100644
--- a/coders/Android.bp
+++ b/coders/Android.bp
@@ -17,7 +17,7 @@
sdk_version: "24",
- srcs: ["*.c"],
+ srcs: ["dds.c", "jpeg.c", "xc.c"],
exclude_srcs: [
// Removed because requires LIBTIFF
diff --git a/coders/coders-list.h b/coders/coders-list.h
index b005230..aa91e3a 100644
--- a/coders/coders-list.h
+++ b/coders/coders-list.h
@@ -14,6 +14,11 @@
limitations under the License.
*/
+#if defined(__ANDROID__)
+AddMagickCoder(DDS)
+AddMagickCoder(JPEG)
+AddMagickCoder(XC)
+#else
AddMagickCoder(AAI)
AddMagickCoder(ART)
AddMagickCoder(AVS)
@@ -183,3 +188,4 @@
#endif
AddMagickCoder(YCBCR)
AddMagickCoder(YUV)
+#endif
