ffmpeg: Don't use Clang's integrated assembler

 * It barfs on some of the GAS-specific directives in ASM.
 * ..and enable building with Clang.

Change-Id: Ib3bfeefd40666e616ce4738a63bc780d51b7567b

diff --git a/android/build.mk b/android/build.mk
index 3a5ff96..20439bf 100644 (file)
--- a/android/build.mk
+++ b/android/build.mk
@@ -104,5 +104,7 @@ LOCAL_CFLAGS += \
        -Werror=return-type -Werror=vla -Wformat -Wno-maybe-uninitialized -fPIC
 
 LOCAL_LDFLAGS := -Wl,--no-fatal-warnings -Wl,-Bsymbolic
-LOCAL_CLANG := false
+
+LOCAL_CLANG_ASFLAGS += -no-integrated-as
+
 LOCAL_SHARED_LIBRARIES := $(sort $(FFLIBS-yes:%=lib%) $(FFLIBS:%=lib%))