commit 8e1554f35ffcc0f7ac833a796adf3926371fcb76
author Mark Salyzyn <salyzyn@google.com> Fri Apr 11 22:05:19 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Apr 11 22:05:19 2014 +0000
tree 16a15b50c6cc47a120ccae11a8bc8fbd2a9d3ae6
parent 0f37620e0f79bfab1354e2e3049c260342a2637e
parent b1b1e303d93a5c67eedeca6ef3039be6cb4dc9f9

am b1b1e303: am e5238893: Merge "Fix aosp_arm64 mirror-aosp-master build 1119326"

* commit 'b1b1e303d93a5c67eedeca6ef3039be6cb4dc9f9':
  Fix aosp_arm64 mirror-aosp-master build 1119326

media/libstagefright/matroska/Android.mk

diff --git a/media/libstagefright/matroska/Android.mk b/media/libstagefright/matroska/Android.mk
index 446ff8c..2d8c1e1 100644
--- a/media/libstagefright/matroska/Android.mk
+++ b/media/libstagefright/matroska/Android.mk
@@ -8,7 +8,7 @@
         $(TOP)/external/libvpx/libwebm \
         $(TOP)/frameworks/native/include/media/openmax \
 
-LOCAL_CFLAGS += -Wno-multichar -Werror
+LOCAL_CFLAGS += -Wno-multichar
 
 LOCAL_MODULE:= libstagefright_matroska
 

media/libstagefright/timedtext/Android.mk

diff --git a/media/libstagefright/timedtext/Android.mk b/media/libstagefright/timedtext/Android.mk
index 6a8b9fc..c4cfa17 100644
--- a/media/libstagefright/timedtext/Android.mk
+++ b/media/libstagefright/timedtext/Android.mk
@@ -9,7 +9,7 @@
         TimedTextSRTSource.cpp    \
         TimedTextPlayer.cpp
 
-LOCAL_CFLAGS += -Wno-multichar -Werror
+LOCAL_CFLAGS += -Wno-multichar
 
 LOCAL_C_INCLUDES:= \
         $(TOP)/frameworks/av/include/media/stagefright/timedtext \