Android-x86
Fork
Donation

  • R/O
  • HTTP
  • SSH
  • HTTPS

external-ffmpeg: Commit

external/ffmpeg


Commit MetaInfo

Revisión9cd508b8c502be1c59dd562f17822716e036d109 (tree)
Tiempo2017-08-23 12:42:21
AutorChih-Wei Huang <cwhuang@linu...>
CommiterChih-Wei Huang

Log Message

android: simplify makefiles

Use the variables that have already been defined as possible.

Cambiar Resumen

Diferencia

--- a/android/build.mk
+++ b/android/build.mk
@@ -9,7 +9,7 @@
99 #
1010
1111 ifndef FFDROID_DIR
12-FFDROID_DIR := $(call my-dir)
12+FFDROID_DIR := $(FFMPEG_DIR)android
1313 endif
1414
1515 include $(CLEAR_VARS)
@@ -55,9 +55,7 @@ LOCAL_PROPRIETARY_MODULE := true
5555
5656 LOCAL_SRC_FILES := $(C_FILES) $(S_FILES)
5757
58-LOCAL_C_INCLUDES := \
59- $(FFMPEG_DIR)android/include \
60- $(FFMPEG_DIR)
58+LOCAL_C_INCLUDES := $(SUBDIR) $(FFMPEG_DIR)
6159
6260 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_C_INCLUDES)
6361
--- a/android/config.mak
+++ b/android/config.mak
@@ -5,7 +5,7 @@ ifeq ($(FFMPEG_2ND_ARCH), true)
55 endif
66
77 ifneq (($filter x86 x86_64,$(FFMPEG_ARCH)),)
8- include $(call my-dir)/config-$(FFMPEG_ARCH)-$(FFMPEG_ARCH_VARIANT).mak
8+ include $(FFDROID_DIR)/config-$(FFMPEG_ARCH)-$(FFMPEG_ARCH_VARIANT).mak
99 else
10- include $(call my-dir)/config-$(FFMPEG_ARCH_VARIANT).mak
10+ include $(FFDROID_DIR)/config-$(FFMPEG_ARCH_VARIANT).mak
1111 endif
Show on old repository browser