commit 8756a774806ed44bc4e185a7a5a253f3dfbdc2e7
author Andreas Gampe <agampe@google.com> Fri Dec 12 00:37:51 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 12 00:37:51 2014 +0000
tree aea820a80fbe9a936a4ebf4f13136d526a89f621
parent 524f49e20154bddc6edecfa3376cad3e0169ff86
parent 47ee9b0f8f1046e0012fe1f6c0c00c3e251390fd

Merge "Srtp: Fix Android.mk mistake"

Android.mk

diff --git a/Android.mk b/Android.mk
index 0b49873..4e54347 100644
--- a/Android.mk
+++ b/Android.mk
@@ -34,11 +34,8 @@
     -Wno-ignored-qualifiers \
     -Wno-sign-compare \
     -Wno-missing-field-initializers \
-    -Wno-unused-parameter
-
-ifneq ($(LOCAL_CLANG),true)
-    common_CFLAGS += -Wno-unused-but-set-variable
-endif
+    -Wno-unused-parameter \
+    -Wno-unused-but-set-variable
 
 common_C_INCLUDES = $(LOCAL_PATH)/include
 
@@ -52,7 +49,6 @@
     LOCAL_SDK_VERSION := 9
 endif
 
-
 LOCAL_SRC_FILES := $(common_SRC_FILES)
 LOCAL_CFLAGS += $(common_CFLAGS)
 LOCAL_C_INCLUDES += $(common_C_INCLUDES)