Android-x86
Fork
Donation

  • R/O
  • HTTP
  • SSH
  • HTTPS

external-ffmpeg: Commit

external/ffmpeg


Commit MetaInfo

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

Log Message

android: update rules for ffmpeg master branch

Cambiar Resumen

Diferencia

--- a/android/build.mk
+++ b/android/build.mk
@@ -24,8 +24,9 @@ $(foreach V,$(FF_VARS),$(eval $(call RESET,$(V))))
2424 #$(warning INCLUDING $(wildcard $(LOCAL_PATH)/$(FFMPEG_ARCH)/Makefile) for $(FFMPEG_2ND_ARCH) - $(NEON-OBJS) - $(FF_VARS))
2525
2626 SUBDIR := $(FFDROID_DIR)/include/
27+include $(FFDROID_DIR)/config.mak
2728 include $(LOCAL_PATH)/Makefile $(wildcard $(LOCAL_PATH)/$(FFMPEG_ARCH_DIR)/Makefile)
28-include $(FFMPEG_DIR)arch.mak
29+include $(FFMPEG_DIR)ffbuild/arch.mak
2930
3031 # remove duplicate objects
3132 OBJS := $(sort $(OBJS) $(OBJS-yes))
--- a/gen-android-configs
+++ b/gen-android-configs
@@ -30,9 +30,9 @@ for TARGET in $TARGETS;do
3030 cp config.asm android/include/config-${TARGET}.asm
3131 TARGET=$TARGET-$TARGET
3232 fi
33- cp config.mak android/config-${TARGET}.mak
33+ mv ffbuild/config.mak android/config-${TARGET}.mak
3434 cat config.h | sed -e "s/^#define \(ARCH_.*\|HAVE_.*\) \(.*\)/#ifdef \1\n#undef \1\n#endif\n#define \1 \2/g" > android/include/config-${TARGET}.h
35- rm -f config.asm config.mak config.h
35+ rm -f config.asm config.h
3636 done
3737
3838 mv libavutil/avconfig.h android/include/libavutil/
Show on old repository browser