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

Commit 626f0dc7 authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

Merge "Deprecations are warnings not errors" into mnc-dev

parents da28c868 85d99546

core/jni/Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -257,7 +257,8 @@ LOCAL_MODULE:= libandroid_runtime 


# -Wno-unknown-pragmas: necessary for Clang as the GL bindings need to turn

#                       off a GCC warning that Clang doesn't know.

LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code -Wno-unknown-pragmas

LOCAL_CFLAGS += -Wall -Werror -Wno-error=deprecated-declarations -Wunused -Wunreachable-code \

        -Wno-unknown-pragmas



# -Wno-c++11-extensions: Clang warns about Skia using the C++11 override keyword, but this project

#                        is not being compiled with that level. Remove once this has changed.

media/jni/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ LOCAL_C_INCLUDES += \ 
    $(PV_INCLUDES) \

    $(JNI_H_INCLUDE)



LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code

LOCAL_CFLAGS += -Wall -Werror -Wno-error=deprecated-declarations -Wunused -Wunreachable-code



LOCAL_MODULE:= libmedia_jni

media/jni/soundpool/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -18,6 +18,6 @@ LOCAL_SHARED_LIBRARIES := \ 


LOCAL_MODULE:= libsoundpool



LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code

LOCAL_CFLAGS += -Wall -Werror -Wno-error=deprecated-declarations -Wunused -Wunreachable-code



include $(BUILD_SHARED_LIBRARY)

media/tests/audiotests/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -18,6 +18,6 @@ LOCAL_SHARED_LIBRARIES := \ 


LOCAL_MODULE_TAGS := tests



LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code

LOCAL_CFLAGS += -Wall -Werror -Wno-error=deprecated-declarations -Wunused -Wunreachable-code



include $(BUILD_EXECUTABLE)