android: update rules for ffmpeg master branch

diff --git a/android/build.mk b/android/build.mk
index 476dadb..fbd7cd0 100644 (file)
--- a/android/build.mk
+++ b/android/build.mk
@@ -24,8 +24,9 @@ $(foreach V,$(FF_VARS),$(eval $(call RESET,$(V))))
 #$(warning INCLUDING $(wildcard $(LOCAL_PATH)/$(FFMPEG_ARCH)/Makefile) for $(FFMPEG_2ND_ARCH) - $(NEON-OBJS) - $(FF_VARS))
 
 SUBDIR := $(FFDROID_DIR)/include/
+include $(FFDROID_DIR)/config.mak
 include $(LOCAL_PATH)/Makefile $(wildcard $(LOCAL_PATH)/$(FFMPEG_ARCH_DIR)/Makefile)
-include $(FFMPEG_DIR)arch.mak
+include $(FFMPEG_DIR)ffbuild/arch.mak
 
 # remove duplicate objects
 OBJS := $(sort $(OBJS) $(OBJS-yes))

diff --git a/gen-android-configs b/gen-android-configs
index bdcaf18..4dd849b 100755 (executable)
--- a/gen-android-configs
+++ b/gen-android-configs
@@ -30,9 +30,9 @@ for TARGET in $TARGETS;do
         cp config.asm android/include/config-${TARGET}.asm
         TARGET=$TARGET-$TARGET
     fi
-    cp config.mak android/config-${TARGET}.mak
+    mv ffbuild/config.mak android/config-${TARGET}.mak
     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
-    rm -f config.asm config.mak config.h
+    rm -f config.asm config.h
 done
 
 mv libavutil/avconfig.h android/include/libavutil/