Android-x86
Fork
Donation

  • R/O
  • HTTP
  • SSH
  • HTTPS

external-ffmpeg: Commit

external/ffmpeg


Commit MetaInfo

Revisiónbcc3dce61fe32be81ab727edb400c8f2a03f6e43 (tree)
Tiempo2017-06-08 00:42:31
AutorChih-Wei Huang <cwhuang@linu...>
CommiterChih-Wei Huang

Log Message

android: use AOSP's rules to build asm

AOSP has rules to build asm since Lollipop. Switch to AOSP's rules
to simplify the makefile.

Cambiar Resumen

Diferencia

--- a/android/build.mk
+++ b/android/build.mk
@@ -57,26 +57,7 @@ else
5757 LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)
5858 endif
5959
60-LOCAL_SRC_FILES := $(C_FILES) $(if $(filter S,$(ASM_SUFFIX)),$(S_FILES))
61-
62-intermediates := $(local-intermediates-dir)
63-ifeq ($(FFMPEG_ARCH),x86)
64-GEN := $(S_OBJS:%=$(intermediates)/$(FFMPEG_ARCH)/%)
65-$(GEN): YASM := prebuilts/misc/$(BUILD_OS)-$(HOST_PREBUILT_ARCH)/yasm/yasm
66-$(GEN): YASMFLAGS := -felf -DPIC $(LOCAL_C_INCLUDES:%=-I%)
67-$(GEN): PRIVATE_CUSTOM_TOOL = $(YASM) $(YASMFLAGS) -Pconfig-x86.asm -o $@ $<
68-$(GEN): $(intermediates)/$(FFMPEG_ARCH)/%.o: $(LOCAL_PATH)/%.asm $(SUBDIR)config-x86.asm
69- $(transform-generated-source)
70-LOCAL_GENERATED_SOURCES_x86 += $(GEN)
71-else ifeq ($(FFMPEG_ARCH),x86_64)
72-GEN64 := $(S_OBJS:%=$(intermediates)/$(FFMPEG_ARCH)/%)
73-$(GEN64): YASM := prebuilts/misc/$(BUILD_OS)-$(HOST_PREBUILT_ARCH)/yasm/yasm
74-$(GEN64): YASMFLAGS := -felf -DPIC $(LOCAL_C_INCLUDES:%=-I%) -m amd64
75-$(GEN64): PRIVATE_CUSTOM_TOOL = $(YASM) $(YASMFLAGS) -Pconfig-x86_64.asm -o $@ $<
76-$(GEN64): $(intermediates)/$(FFMPEG_ARCH)/%.o: $(LOCAL_PATH)/%.asm $(SUBDIR)config-x86_64.asm
77- $(transform-generated-source)
78-LOCAL_GENERATED_SOURCES_x86_64 += $(GEN64)
79-endif
60+LOCAL_SRC_FILES := $(C_FILES) $(S_FILES)
8061
8162 LOCAL_CFLAGS += \
8263 -O3 -std=c99 -fno-math-errno -fno-signed-zeros -fomit-frame-pointer \
@@ -86,8 +67,11 @@ LOCAL_CFLAGS += \
8667 -Werror=format-security -Werror=implicit-function-declaration -Werror=missing-prototypes \
8768 -Werror=return-type -Werror=vla -Wformat -Wno-maybe-uninitialized -fPIC
8869
70+LOCAL_ASFLAGS_x86 := -Pconfig-x86.asm
71+LOCAL_ASFLAGS_x86_64 := -Pconfig-x86_64.asm
72+
8973 LOCAL_LDFLAGS := -Wl,--no-fatal-warnings -Wl,-Bsymbolic
9074
91-LOCAL_CLANG_ASFLAGS += -no-integrated-as
75+LOCAL_CLANG_ASFLAGS += $(if $(filter x86,$(FFMPEG_ARCH_DIR)),,-no-integrated-as)
9276
9377 LOCAL_SHARED_LIBRARIES := $($(NAME)_FFLIBS:%=lib%)
Show on old repository browser