summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2016-01-22 01:03:45 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-01-22 01:03:45 +0000
commit8098ca68c87113a65cda866829205ce451c2ae83 (patch)
tree7ad7565d811ace7ed36d9f37cdc629a9fb8a4842
parent29433d8e7afc574efa243a32fb9bd506f5095cc4 (diff)
parentd3bd739763e90807ca36b264972a6fafeecc6ef3 (diff)
downloadsonivox-nougat-mr1-release.tar.gz
Merge "sonivox: -Wno-unused-parameter." am: 825ad522d5android-cts_7.1_r1android-cts-7.1_r9android-cts-7.1_r8android-cts-7.1_r7android-cts-7.1_r6android-cts-7.1_r5android-cts-7.1_r4android-cts-7.1_r3android-cts-7.1_r29android-cts-7.1_r28android-cts-7.1_r27android-cts-7.1_r26android-cts-7.1_r25android-cts-7.1_r24android-cts-7.1_r23android-cts-7.1_r22android-cts-7.1_r21android-cts-7.1_r20android-cts-7.1_r2android-cts-7.1_r19android-cts-7.1_r18android-cts-7.1_r17android-cts-7.1_r16android-cts-7.1_r15android-cts-7.1_r14android-cts-7.1_r13android-cts-7.1_r12android-cts-7.1_r11android-cts-7.1_r10android-cts-7.1_r1android-cts-7.0_r9android-cts-7.0_r8android-cts-7.0_r7android-cts-7.0_r6android-cts-7.0_r5android-cts-7.0_r4android-cts-7.0_r33android-cts-7.0_r32android-cts-7.0_r31android-cts-7.0_r30android-cts-7.0_r3android-cts-7.0_r29android-cts-7.0_r28android-cts-7.0_r27android-cts-7.0_r26android-cts-7.0_r25android-cts-7.0_r24android-cts-7.0_r23android-cts-7.0_r22android-cts-7.0_r21android-cts-7.0_r20android-cts-7.0_r2android-cts-7.0_r19android-cts-7.0_r18android-cts-7.0_r17android-cts-7.0_r16android-cts-7.0_r15android-cts-7.0_r14android-cts-7.0_r13android-cts-7.0_r12android-cts-7.0_r11android-cts-7.0_r10android-cts-7.0_r1android-7.1.1_r9android-7.1.1_r8android-7.1.1_r7android-7.1.1_r6android-7.1.1_r4android-7.1.1_r3android-7.1.1_r28android-7.1.1_r27android-7.1.1_r26android-7.1.1_r25android-7.1.1_r24android-7.1.1_r23android-7.1.1_r22android-7.1.1_r21android-7.1.1_r20android-7.1.1_r2android-7.1.1_r17android-7.1.1_r16android-7.1.1_r15android-7.1.1_r14android-7.1.1_r13android-7.1.1_r12android-7.1.1_r11android-7.1.1_r10android-7.1.1_r1android-7.1.0_r7android-7.1.0_r6android-7.1.0_r5android-7.1.0_r4android-7.1.0_r3android-7.1.0_r2android-7.1.0_r1android-7.0.0_r9android-7.0.0_r8android-7.0.0_r7android-7.0.0_r6android-7.0.0_r5android-7.0.0_r4android-7.0.0_r31android-7.0.0_r30android-7.0.0_r3android-7.0.0_r29android-7.0.0_r28android-7.0.0_r27android-7.0.0_r24android-7.0.0_r21android-7.0.0_r19android-7.0.0_r17android-7.0.0_r15android-7.0.0_r14android-7.0.0_r13android-7.0.0_r12android-7.0.0_r11android-7.0.0_r10android-7.0.0_r1nougat-releasenougat-mr1.4-releasenougat-mr1.2-releasenougat-mr1-releasenougat-mr1-cts-releasenougat-dr1-releasenougat-devnougat-cts-releasenougat-bugfix-release
am: d3bd739763 * commit 'd3bd739763e90807ca36b264972a6fafeecc6ef3': sonivox: -Wno-unused-parameter.
-rw-r--r--arm-wt-22k/Android.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/arm-wt-22k/Android.mk b/arm-wt-22k/Android.mk
index fd9ca69..b9ea9fd 100644
--- a/arm-wt-22k/Android.mk
+++ b/arm-wt-22k/Android.mk
@@ -52,7 +52,8 @@ LOCAL_CFLAGS+= -O2 -D UNIFIED_DEBUG_MESSAGES -D EAS_WT_SYNTH \
-D _SAMPLE_RATE_22050 -D MAX_SYNTH_VOICES=64 \
-D _8_BIT_SAMPLES -D _FILTER_ENABLED \
-D DLS_SYNTHESIZER \
- -D _REVERB_ENABLED
+ -D _REVERB_ENABLED \
+ -Wno-unused-parameter \
# not using these options
# -D _WAVE_PARSER