From 85d99546a0dd6e38c2d60903c3b3e73577e1207c Mon Sep 17 00:00:00 2001 From: Glenn Kasten Date: Mon, 18 May 2015 12:27:57 -0700 Subject: [PATCH] Deprecations are warnings not errors Change-Id: Ib77f45fdc27ea53f1dd181f48c76810d03f8dcdb --- core/jni/Android.mk | 3 ++- media/jni/Android.mk | 2 +- media/jni/soundpool/Android.mk | 2 +- media/tests/audiotests/Android.mk | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/core/jni/Android.mk b/core/jni/Android.mk index 5448214aefb44..40fee2cbb60b5 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -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. diff --git a/media/jni/Android.mk b/media/jni/Android.mk index 51d0140387797..79557bc928385 100644 --- a/media/jni/Android.mk +++ b/media/jni/Android.mk @@ -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 diff --git a/media/jni/soundpool/Android.mk b/media/jni/soundpool/Android.mk index 24760561e1192..2bc41b56d5aaf 100644 --- a/media/jni/soundpool/Android.mk +++ b/media/jni/soundpool/Android.mk @@ -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) diff --git a/media/tests/audiotests/Android.mk b/media/tests/audiotests/Android.mk index 794e7f22419aa..3507434c13d40 100644 --- a/media/tests/audiotests/Android.mk +++ b/media/tests/audiotests/Android.mk @@ -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)