android: simplify makefiles

Use the variables that have already been defined as possible.

diff --git a/android/build.mk b/android/build.mk
index ec7d342..d70b9ea 100644 (file)
--- a/android/build.mk
+++ b/android/build.mk
@@ -9,7 +9,7 @@
 #
 
 ifndef FFDROID_DIR
-FFDROID_DIR := $(call my-dir)
+FFDROID_DIR := $(FFMPEG_DIR)android
 endif
 
 include $(CLEAR_VARS)
@@ -55,9 +55,7 @@ LOCAL_PROPRIETARY_MODULE := true
 
 LOCAL_SRC_FILES := $(C_FILES) $(S_FILES)
 
-LOCAL_C_INCLUDES := \
-       $(FFMPEG_DIR)android/include \
-       $(FFMPEG_DIR)
+LOCAL_C_INCLUDES := $(SUBDIR) $(FFMPEG_DIR)
 
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_C_INCLUDES)
 

diff --git a/android/config.mak b/android/config.mak
index eae2040..017ac74 100644 (file)
--- a/android/config.mak
+++ b/android/config.mak
@@ -5,7 +5,7 @@ ifeq ($(FFMPEG_2ND_ARCH), true)
 endif
 
 ifneq (($filter x86 x86_64,$(FFMPEG_ARCH)),)
-   include $(call my-dir)/config-$(FFMPEG_ARCH)-$(FFMPEG_ARCH_VARIANT).mak
+   include $(FFDROID_DIR)/config-$(FFMPEG_ARCH)-$(FFMPEG_ARCH_VARIANT).mak
 else
-   include $(call my-dir)/config-$(FFMPEG_ARCH_VARIANT).mak
+   include $(FFDROID_DIR)/config-$(FFMPEG_ARCH_VARIANT).mak
 endif