Android.mk: include both ffmpeg/include

43184e95 · Zhang Rui · 3dfa1bab · 43184e95 · 43184e95
隐藏空白更改
内联并排

Showing with 3 addition and 2 deletion

ijkmediaplayer/jni/Android.mk ijkmediaplayer/jni/Android.mk +2 -2

ijkmediaplayer/jni/ijkplayer/Android.mk ijkmediaplayer/jni/ijkplayer/Android.mk +1 -0

未找到文件。
--- a/ijkmediaplayer/jni/Android.mk
+++ b/ijkmediaplayer/jni/Android.mk
@@ -24,7 +24,7 @@ MY_APP_REPO_ROOT := $(realpath $(MY_APP_PRJ_ROOT)/..)

 # armeabi-v7a
 MY_APP_FFMPEG_OUTPUT_PATH := $(realpath $(MY_APP_REPO_ROOT)/build/ffmpeg-armv7a/output)
-# MY_APP_FFMPEG_INCLUDE_PATH := $(realpath $(MY_APP_FFMPEG_OUTPUT_PATH)/include)
-MY_APP_FFMPEG_INCLUDE_PATH := $(realpath $(MY_APP_REPO_ROOT)/ffmpeg/include)
+MY_APP_FFMPEG_INCLUDE_PATH := $(realpath $(MY_APP_FFMPEG_OUTPUT_PATH)/include)
+MY_APP_FFMPEG_INCLUDE_PATH_ALTER := $(realpath $(MY_APP_REPO_ROOT)/ffmpeg/include)

 include $(call all-subdir-makefiles)
--- a/ijkmediaplayer/jni/ijkplayer/Android.mk
+++ b/ijkmediaplayer/jni/ijkplayer/Android.mk
@@ -25,6 +25,7 @@ LOCAL_LDLIBS += -llog -landroid

 LOCAL_C_INCLUDES += $(LOCAL_PATH)
 LOCAL_C_INCLUDES += $(MY_APP_FFMPEG_INCLUDE_PATH)
+LOCAL_C_INCLUDES += $(MY_APP_FFMPEG_INCLUDE_PATH_ALTER)
 LOCAL_C_INCLUDES += $(MY_APP_JNI_ROOT)

 LOCAL_SRC_FILES += $(notdir $(wildcard *.c))