commit a96eaff3ca4c9d39f6e55c270600826f0d73141f
author Jean-Baptiste Queru <jbq@google.com> Thu Sep 06 16:11:25 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 06 16:11:25 2012 -0700
tree 97d2aea36a265567334dc289987c8110501ca9ee
parent 3a3161fc408f49972edb16a94c5248169cd513be
parent 4a213147dbe60416aa26ebdba0f3c631b2e2b013

am 4a213147: am 274d0571: Merge "Added support for parsing XMF versions 1.00 and 1.01 headers"

* commit '4a213147dbe60416aa26ebdba0f3c631b2e2b013':
  Added support for parsing XMF versions 1.00 and 1.01 headers

arm-wt-22k/Android.mk

diff --git a/arm-wt-22k/Android.mk b/arm-wt-22k/Android.mk
index 71fbcf8..8a854f7 100644
--- a/arm-wt-22k/Android.mk
+++ b/arm-wt-22k/Android.mk
@@ -89,9 +89,13 @@
 	--defsym FILTER_ENABLED=1 \
 	--defsym SAMPLES_8_BIT=1
 
-LOCAL_CFLAGS+= -D NATIVE_EAS_KERNEL \
+LOCAL_ASFLAGS := \
 	$(foreach f,$(asm_flags),-Wa,"$(f)")
 
+asm_flags :=
+
+LOCAL_CFLAGS += -D NATIVE_EAS_KERNEL
+
 LOCAL_COPY_HEADERS += lib_src/ARM_synth_constants_gnu.inc
 endif
 
@@ -101,4 +105,3 @@
 LOCAL_LDLIBS := -lpthread
 
 include $(BUILD_SHARED_LIBRARY)
-