commit 5691a8ecaba367d04b2c2a13ec1e9e05f4f17b7c
author Bill Yi <byi@google.com> Tue Dec 06 23:56:14 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Dec 06 23:56:14 2016 +0000
tree 8c5fd103ad9cb132c552e2af85819c64f67b3634
parent 6d5e443d5f090be54f0f1623171bf83102c0e688
parent 7a8860406c015bbc63f382efed9372044eb0cb74

Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: 47d4c9ba5a am: 662bce0572 am: 09bac87fe5
am: 7a8860406c

Change-Id: Ifb7f9c4e39bcc959389e408c65680d11216ab496

Magick++/Android.mk

diff --git a/Magick++/Android.mk b/Magick++/Android.mk
index 23d79db..3107fff 100644
--- a/Magick++/Android.mk
+++ b/Magick++/Android.mk
@@ -44,7 +44,7 @@
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/.. \
     $(LOCAL_PATH)/lib
 
-LOCAL_CFLAGS += -DHAVE_CONFIG_H
+LOCAL_CFLAGS += -DHAVE_CONFIG_H -Wno-deprecated-register
 
 LOCAL_CPPFLAGS += -fexceptions
 
@@ -52,4 +52,4 @@
     external/ImageMagick/Magick++/lib \
     external/ImageMagick
 
-include $(BUILD_STATIC_LIBRARY)
\ No newline at end of file
+include $(BUILD_STATIC_LIBRARY)

MagickCore/Android.mk

diff --git a/MagickCore/Android.mk b/MagickCore/Android.mk
index 19bc8b5..9df62ac 100644
--- a/MagickCore/Android.mk
+++ b/MagickCore/Android.mk
@@ -118,9 +118,10 @@
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/.. \
     external/freetype/include
 
-LOCAL_CFLAGS += -DHAVE_CONFIG_H
+LOCAL_CFLAGS += -DHAVE_CONFIG_H -Wno-unused-parameter -Wno-deprecated-register \
+    -Wno-enum-conversion -Wno-for-loop-analysis
 
 LOCAL_STATIC_LIBRARIES += libbz
 LOCAL_SHARED_LIBRARIES += libft2 liblzma libxml2 libicuuc libpng libjpeg
 
-include $(BUILD_STATIC_LIBRARY)
\ No newline at end of file
+include $(BUILD_STATIC_LIBRARY)

MagickWand/Android.mk

diff --git a/MagickWand/Android.mk b/MagickWand/Android.mk
index 50fe6f6..5464480 100644
--- a/MagickWand/Android.mk
+++ b/MagickWand/Android.mk
@@ -48,8 +48,8 @@
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/.. \
     external/freetype/include
 
-LOCAL_CFLAGS += -DHAVE_CONFIG_H
+LOCAL_CFLAGS += -DHAVE_CONFIG_H -Wno-unused-parameter
 
 LOCAL_STATIC_LIBRARIES += libbz
 
-include $(BUILD_STATIC_LIBRARY)
\ No newline at end of file
+include $(BUILD_STATIC_LIBRARY)

coders/Android.mk

diff --git a/coders/Android.mk b/coders/Android.mk
index eecdda6..427585b 100644
--- a/coders/Android.mk
+++ b/coders/Android.mk
@@ -150,7 +150,7 @@
 
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
 
-LOCAL_CFLAGS += -DHAVE_CONFIG_H
+LOCAL_CFLAGS += -DHAVE_CONFIG_H -Wno-unused-parameter -Wno-for-loop-analysis
 
 LOCAL_STATIC_LIBRARIES += libbz
 LOCAL_SHARED_LIBRARIES += libft2 liblzma libxml2 libicuuc libpng libjpeg