Merge "Use -Werror in frameworks/av/services/mediaextractor" am: 5988a68bb3 am: 868705c87f

am: d9ad45b8a5

Change-Id: Ic6679ffafbad08d2b6b6bac9bd8bcdddcd1c9c7a

media/libstagefright/foundation/include/media/stagefright/foundation/ADebug.h

@@ -82,6 +82,10 @@ MAKE_COMPARATOR(GE,>=)
 MAKE_COMPARATOR(LT,<)
 MAKE_COMPARATOR(GT,>)
 
+#ifdef CHECK_OP
+#undef CHECK_OP
+#endif
+
 #define CHECK_OP(x,y,suffix,op)                                         \
     do {                                                                \
         AString ___res = Compare_##suffix(x, y);                        \

services/mediaextractor/Android.mk

@@ -3,6 +3,7 @@ LOCAL_PATH := $(call my-dir)
 # service library
 include $(CLEAR_VARS)
 LOCAL_SRC_FILES := MediaExtractorService.cpp
+LOCAL_CFLAGS := -Wall -Werror
 LOCAL_SHARED_LIBRARIES := libmedia libstagefright libbinder libutils liblog
 LOCAL_MODULE:= libmediaextractorservice
 include $(BUILD_SHARED_LIBRARY)
@@ -35,6 +36,7 @@ LOCAL_STATIC_LIBRARIES := libicuandroid_utils
 LOCAL_MODULE:= mediaextractor
 LOCAL_INIT_RC := mediaextractor.rc
 LOCAL_C_INCLUDES := frameworks/av/media/libmedia
+LOCAL_CFLAGS := -Wall -Werror
 include $(BUILD_EXECUTABLE)
 
 # service seccomp filter