diff options
| author | Glenn Kasten <gkasten@google.com> | 2015-05-28 22:51:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-28 22:51:05 +0000 |
| commit | db431db53fbbb9024b6e72c528e2d195d63ad544 (patch) | |
| tree | 5bde5eb0c768258b4a103f6ef753ba80f8c820cb | |
| parent | fb683371379606bd3f41c880d83e33f8f3e445ac (diff) | |
| parent | f6b3e7db0b18a7d187d026dd729ae12fd521005e (diff) | |
| download | frameworks_av-db431db53fbbb9024b6e72c528e2d195d63ad544.zip frameworks_av-db431db53fbbb9024b6e72c528e2d195d63ad544.tar.gz frameworks_av-db431db53fbbb9024b6e72c528e2d195d63ad544.tar.bz2 | |
Merge "Deprecations are warnings not errors" into mnc-dev
| -rw-r--r-- | media/libmedia/Android.mk | 4 | ||||
| -rw-r--r-- | media/libmediaplayerservice/Android.mk | 2 | ||||
| -rw-r--r-- | media/libstagefright/Android.mk | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/media/libmedia/Android.mk b/media/libmedia/Android.mk index 0c18828..a3c3d3c 100644 --- a/media/libmedia/Android.mk +++ b/media/libmedia/Android.mk @@ -7,7 +7,7 @@ LOCAL_SRC_FILES:= \ LOCAL_MODULE:= libmedia_helper LOCAL_MODULE_TAGS := optional -LOCAL_C_FLAGS += -Werror -Wall +LOCAL_C_FLAGS += -Werror -Wno-error=deprecated-declarations -Wall LOCAL_CLANG := true include $(BUILD_STATIC_LIBRARY) @@ -87,7 +87,7 @@ LOCAL_C_INCLUDES := \ $(call include-path-for, audio-effects) \ $(call include-path-for, audio-utils) -LOCAL_CFLAGS += -Werror -Wall +LOCAL_CFLAGS += -Werror -Wno-error=deprecated-declarations -Wall LOCAL_CLANG := true include $(BUILD_SHARED_LIBRARY) diff --git a/media/libmediaplayerservice/Android.mk b/media/libmediaplayerservice/Android.mk index 2c4e719..b52db97 100644 --- a/media/libmediaplayerservice/Android.mk +++ b/media/libmediaplayerservice/Android.mk @@ -54,7 +54,7 @@ LOCAL_C_INCLUDES := \ $(TOP)/frameworks/native/include/media/openmax \ $(TOP)/external/tremolo/Tremolo \ -LOCAL_CFLAGS += -Werror -Wall +LOCAL_CFLAGS += -Werror -Wno-error=deprecated-declarations -Wall LOCAL_CLANG := true LOCAL_MODULE:= libmediaplayerservice diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk index 6010558..337068e 100644 --- a/media/libstagefright/Android.mk +++ b/media/libstagefright/Android.mk @@ -124,7 +124,9 @@ LOCAL_SHARED_LIBRARIES += \ libdl \ libRScpp \ -LOCAL_CFLAGS += -Wno-multichar -Werror -Wall -DENABLE_STAGEFRIGHT_EXPERIMENTS +LOCAL_CFLAGS += -Wno-multichar -Werror -Wno-error=deprecated-declarations -Wall \ + -DENABLE_STAGEFRIGHT_EXPERIMENTS + LOCAL_CLANG := true LOCAL_MODULE:= libstagefright |