Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 868705c8 authored by Chih-hung Hsieh's avatar Chih-hung Hsieh Committed by android-build-merger
Browse files

Merge "Use -Werror in frameworks/av/services/mediaextractor" 

am: 5988a68b

Change-Id: Id47a3227c34017b8b1658d19bad99543455456e1
parents 63d03638 5988a68b

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

+4 −0
Original line number Diff line number Diff line
@@ -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

+2 −0
Original line number Diff line number Diff line
@@ -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)
@@ -21,6 +22,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