summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorAravind Asam <aasam@codeaurora.org>2015-09-25 14:02:11 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2015-10-09 14:46:58 -0700
commit2860671de710281c35df163d343f2ab2ec9bf736 (patch)
tree8ed907d857b14456b12c20ba416f3bd9acbca8e6 /media
parenta9961f6786d048c247cd41363e2b784e1a5aeab4 (diff)
downloadframeworks_av-2860671de710281c35df163d343f2ab2ec9bf736.zip
frameworks_av-2860671de710281c35df163d343f2ab2ec9bf736.tar.gz
frameworks_av-2860671de710281c35df163d343f2ab2ec9bf736.tar.bz2
Opt out of clang till issues are fixed
Needed for moving to clang Change-Id: I984ce0d452bcd9025d743c0f081bb0d22587b106
Diffstat (limited to 'media')
-rw-r--r--media/libavextensions/Android.mk3
-rw-r--r--media/libstagefright/codecs/amrnb/dec/Android.mk1
2 files changed, 4 insertions, 0 deletions
diff --git a/media/libavextensions/Android.mk b/media/libavextensions/Android.mk
index 0bc886d..0380135 100644
--- a/media/libavextensions/Android.mk
+++ b/media/libavextensions/Android.mk
@@ -22,6 +22,7 @@ ifeq ($(TARGET_ENABLE_QC_AV_ENHANCEMENTS),true)
endif
LOCAL_MODULE:= libavextensions
+LOCAL_CLANG := false
LOCAL_MODULE_TAGS := optional
@@ -49,6 +50,7 @@ ifeq ($(TARGET_ENABLE_QC_AV_ENHANCEMENTS),true)
endif
LOCAL_MODULE:= libavmediaextentions
+LOCAL_CLANG := false
LOCAL_MODULE_TAGS := optional
@@ -82,6 +84,7 @@ ifeq ($(TARGET_ENABLE_QC_AV_ENHANCEMENTS),true)
endif
LOCAL_MODULE:= libavmediaserviceextensions
+LOCAL_CLANG := false
LOCAL_MODULE_TAGS := optional
diff --git a/media/libstagefright/codecs/amrnb/dec/Android.mk b/media/libstagefright/codecs/amrnb/dec/Android.mk
index 3750e2e..415702e 100644
--- a/media/libstagefright/codecs/amrnb/dec/Android.mk
+++ b/media/libstagefright/codecs/amrnb/dec/Android.mk
@@ -80,6 +80,7 @@ LOCAL_SHARED_LIBRARIES := \
libstagefright_amrnb_common
LOCAL_MODULE := libstagefright_soft_amrdec
+LOCAL_CLANG := false
LOCAL_MODULE_TAGS := optional
include $(BUILD_SHARED_LIBRARY)