diff options
| author | Andreas Gampe <agampe@google.com> | 2014-12-11 16:33:12 -0800 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2014-12-11 16:33:12 -0800 |
| commit | 47ee9b0f8f1046e0012fe1f6c0c00c3e251390fd (patch) | |
| tree | aea820a80fbe9a936a4ebf4f13136d526a89f621 | |
| parent | 524f49e20154bddc6edecfa3376cad3e0169ff86 (diff) | |
| download | srtp-47ee9b0f8f1046e0012fe1f6c0c00c3e251390fd.tar.gz | |
Srtp: Fix Android.mk mistake
Using LOCAL_CLANG before the CLEAR_VARS actually used the one from
the previous project in Makefile include order.
Drop the whole ifeq. The flag is now filtered out for Clang.
Bug: 18632512
Change-Id: I7b6ca5cf3a6e6a97672bf7157de99daec75bd5a3
| -rw-r--r-- | Android.mk | 8 |
1 files changed, 2 insertions, 6 deletions
@@ -34,11 +34,8 @@ common_CFLAGS := \ -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 @@ ifeq ($(TARGET_ARCH),arm) LOCAL_SDK_VERSION := 9 endif - LOCAL_SRC_FILES := $(common_SRC_FILES) LOCAL_CFLAGS += $(common_CFLAGS) LOCAL_C_INCLUDES += $(common_C_INCLUDES) |