diff options
| author | Glenn Kasten <gkasten@google.com> | 2015-05-28 22:51:15 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-28 22:51:17 +0000 |
| commit | 626f0dc73bc1007d16688eddf29ea58ec26f424e (patch) | |
| tree | 1f5c134f1ea669596d756fb0a3eca59deb67db4b /media/jni | |
| parent | da28c8681a6868d188431aed626abe9bd6da2502 (diff) | |
| parent | 85d99546a0dd6e38c2d60903c3b3e73577e1207c (diff) | |
| download | frameworks_base-626f0dc73bc1007d16688eddf29ea58ec26f424e.zip frameworks_base-626f0dc73bc1007d16688eddf29ea58ec26f424e.tar.gz frameworks_base-626f0dc73bc1007d16688eddf29ea58ec26f424e.tar.bz2 | |
Merge "Deprecations are warnings not errors" into mnc-dev
Diffstat (limited to 'media/jni')
| -rw-r--r-- | media/jni/Android.mk | 2 | ||||
| -rw-r--r-- | media/jni/soundpool/Android.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/media/jni/Android.mk b/media/jni/Android.mk index 51d0140..79557bc 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 2476056..2bc41b5 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) |