summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChih-Hung Hsieh <chh@google.com>2014-09-23 16:54:56 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-09-23 16:54:56 +0000
commitd149516e1a3a63549d2c654b1398544d5de46a3e (patch)
treec158b085e1c9a4e65860f5ac8557339325d7f5f7
parent57daefcbe143f3ce523706b6b107865519bf7aae (diff)
parent7e46495606bd66973a10565f932acee7bddcc003 (diff)
downloadandroid_external_aac-d149516e1a3a63549d2c654b1398544d5de46a3e.tar.gz
android_external_aac-d149516e1a3a63549d2c654b1398544d5de46a3e.tar.bz2
android_external_aac-d149516e1a3a63549d2c654b1398544d5de46a3e.zip
am 7e464956: Merge "Move Clang only flags into LOCAL_CLANG_CPPFLAGS."
* commit '7e46495606bd66973a10565f932acee7bddcc003': Move Clang only flags into LOCAL_CLANG_CPPFLAGS.
-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