ffmpeg: Don't use Clang's integrated assembler

[android-x86/external-ffmpeg.git] / android / build.mk

diff --git a/android/build.mk b/android/build.mk
index 70641d1..20439bf 100644 (file)
--- a/android/build.mk
+++ b/android/build.mk
@@ -74,6 +74,12 @@ LOCAL_MODULE := lib$(NAME)
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 LOCAL_ARM_MODE := arm
+ifdef TARGET_2ND_ARCH
+LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib
+LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64
+else
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)
+endif
 
 LOCAL_SRC_FILES := $(C_FILES) $(if $(filter S,$(ASM_SUFFIX)),$(S_FILES))
 
@@ -99,4 +105,6 @@ LOCAL_CFLAGS += \
 
 LOCAL_LDFLAGS := -Wl,--no-fatal-warnings -Wl,-Bsymbolic
 
+LOCAL_CLANG_ASFLAGS += -no-integrated-as
+
 LOCAL_SHARED_LIBRARIES := $(sort $(FFLIBS-yes:%=lib%) $(FFLIBS:%=lib%))