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

Commit 90bdb98b authored by Andreas Huber's avatar Andreas Huber Committed by Android (Google) Code Review
Browse files

Merge "fix the OS X builds until we can fix compiler warnings that apparently"

parents ccb067b1 def582e9

media/libstagefright/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ LOCAL_SHARED_LIBRARIES += \ 
        libstagefright_foundation \

        libdl



LOCAL_CFLAGS += -Wno-multichar -Werror

LOCAL_CFLAGS += -Wno-multichar



LOCAL_MODULE:= libstagefright

media/libstagefright/codecs/on2/enc/Android.mk

+0 −2
Original line number Diff line number Diff line
@@ -26,6 +26,4 @@ LOCAL_SHARED_LIBRARIES := \ 
LOCAL_MODULE := libstagefright_soft_vpxenc

LOCAL_MODULE_TAGS := optional



LOCAL_CFLAGS += -Werror



include $(BUILD_SHARED_LIBRARY)

media/libstagefright/colorconversion/Android.mk

+0 −2
Original line number Diff line number Diff line
@@ -11,6 +11,4 @@ LOCAL_C_INCLUDES := \ 


LOCAL_MODULE:= libstagefright_color_conversion



LOCAL_CFLAGS += -Werror



include $(BUILD_STATIC_LIBRARY)

media/libstagefright/omx/Android.mk

+0 −2
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ LOCAL_C_INCLUDES += \ 
        $(TOP)/frameworks/native/include/media/hardware \

        $(TOP)/frameworks/native/include/media/openmax



LOCAL_CFLAGS += -Werror



LOCAL_SHARED_LIBRARIES :=               \

        libbinder                       \

        libmedia                        \

media/libstagefright/wifi-display/Android.mk

+0 −2
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ LOCAL_C_INCLUDES:= \ 
        $(TOP)/frameworks/native/include/media/openmax \

        $(TOP)/frameworks/av/media/libstagefright/mpeg2ts \



LOCAL_CFLAGS += -Werror



LOCAL_SHARED_LIBRARIES:= \

        libbinder                       \

        libcutils                       \