summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChih-Hung Hsieh <chh@google.com>2014-09-23 16:29:41 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-09-23 16:29:42 +0000
commit7e46495606bd66973a10565f932acee7bddcc003 (patch)
treeea8b26f5354e60db1defe903e9e54ed5eb3c7f47
parent4803bf75f564e5c9304527a5b902711f78e9f621 (diff)
parent3c4c8d631fe5b521292bd7dfa4394ef9652becf4 (diff)
downloadandroid_external_aac-7e46495606bd66973a10565f932acee7bddcc003.tar.gz
android_external_aac-7e46495606bd66973a10565f932acee7bddcc003.tar.bz2
android_external_aac-7e46495606bd66973a10565f932acee7bddcc003.zip
Merge "Move Clang only flags into LOCAL_CLANG_CPPFLAGS."android-l-preview_r2
-rw-r--r--Android.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index 5556bdc..9e56a2d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -55,7 +55,7 @@ LOCAL_C_INCLUDES := \
# In tpdec_asc.cpp: address of array 'pPce->FrontElementIsCpe'
# will always evaluate to 'true'.
-LOCAL_CPPFLAGS += \
+LOCAL_CLANG_CPPFLAGS += \
-Wno-pointer-bool-conversion
LOCAL_MODULE:= libFraunhoferAAC