[Android] libiomx: move iomx_hwbuffer.cpp to nativewindowpriv.c
Thomas Guillem
git at videolan.org
Thu Oct 2 10:22:03 CEST 2014
vlc-ports/android | branch: master | Thomas Guillem <thomas.guillem at gmail.com> | Wed Oct 1 10:33:37 2014 +0200| [38912030beb6e7da7ae9d956d98438d7273c40d2] | committer: Jean-Baptiste Kempf
libiomx: move iomx_hwbuffer.cpp to nativewindowpriv.c
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=38912030beb6e7da7ae9d956d98438d7273c40d2
---
vlc-android/jni/Android.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/vlc-android/jni/Android.mk b/vlc-android/jni/Android.mk
index 8366ab4..fddb5de 100644
--- a/vlc-android/jni/Android.mk
+++ b/vlc-android/jni/Android.mk
@@ -86,8 +86,8 @@ LIBIOMX_LDLIBS_COMMON := -L$(ANDROID_LIBS) -lgcc -lstagefright -lmedia -lutils -
LIBIOMX_CFLAGS_COMMON := -Wno-psabi
# Once we always build this with a version of vlc that contains iomx_hwbuffer.c,
# we can remove this condition
-ifneq (,$(wildcard $(LOCAL_PATH)/../$(VLC_SRC_DIR)/modules/codec/omxil/iomx_hwbuffer.c))
-LIBIOMX_SRC_FILES_COMMON += ../$(VLC_SRC_DIR)/modules/codec/omxil/iomx_hwbuffer.c
+ifneq (,$(wildcard $(LOCAL_PATH)/../$(VLC_SRC_DIR)/modules/video_output/android/nativewindowpriv.c))
+LIBIOMX_SRC_FILES_COMMON += ../$(VLC_SRC_DIR)/modules/video_output/android/nativewindowpriv.c
endif
# no hwbuffer for gingerbread
More information about the Android
mailing list