commit f5fef23c56fc7f1f6dbfc61d385a8f8861d9777b
author Marco Nelissen <marcone@google.com> Thu Aug 20 01:16:28 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Aug 20 01:16:28 2015 +0000
tree 12a940bb1a93e261ec170bf240101d54036bd3ad
parent 68fcda9a884cefe7530d2306bc39ce185ebd1660
parent e5a668d076a22427aea8e92e22b073bac6ff9087

am e5a668d0: am 36ec928f: Fix vorbis decoder crash due to out of bounds memory access

* commit 'e5a668d076a22427aea8e92e22b073bac6ff9087':
  Fix vorbis decoder crash due to out of bounds memory access

Android.mk

diff --git a/Android.mk b/Android.mk
index 9e3a0a0..3a0e54b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -24,6 +24,9 @@
 	Tremolo/mdctARM.s
 LOCAL_CFLAGS += \
     -D_ARM_ASSEM_
+# Assembly code in asm_arm.h does not compile with Clang.
+LOCAL_CLANG_ASFLAGS += \
+    -no-integrated-as
 else
 LOCAL_CFLAGS += \
     -DONLY_C