[Android] fix libanw/libiomx build

Thomas Guillem git at videolan.org
Fri Feb 6 09:38:45 CET 2015


vlc-ports/android | branch: master | Thomas Guillem <thomas at gllm.fr> | Fri Feb  6 09:27:30 2015 +0100| [1c1a7b16d4e6aa08c000f778bbf42c954548e6af] | committer: Thomas Guillem

fix libanw/libiomx build

> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=1c1a7b16d4e6aa08c000f778bbf42c954548e6af
---

 libvlc/jni/Android.mk |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/libvlc/jni/Android.mk b/libvlc/jni/Android.mk
index d768449..413d024 100644
--- a/libvlc/jni/Android.mk
+++ b/libvlc/jni/Android.mk
@@ -165,7 +165,7 @@ LOCAL_MODULE := $(1)
 LOCAL_SRC_FILES  := $(VLC_SRC_DIR)/modules/codec/omxil/iomx.cpp
 LOCAL_C_INCLUDES := $(LIBIOMX_INCLUDES_$(2))
 LOCAL_LDLIBS     := -L$(ANDROID_PRIVATE_LIBDIR)/$(TARGET_TUPLE) -lgcc -lstagefright -lmedia -lutils -lbinder -llog -lcutils -lui
-LOCAL_CFLAGS     := -Wno-psabi -DAPP_PLATFORM=$(2)
+LOCAL_CFLAGS     := -Wno-psabi -DANDROID_API=$(2)
 $(TARGET_OUT)/$(1).so: $(ANDROID_PRIVATE_LIBS)
 include $(BUILD_SHARED_LIBRARY)
 endef
@@ -186,13 +186,12 @@ LOCAL_MODULE := $(1)
 LOCAL_SRC_FILES  := $(LIBANW_SRC_FILES_COMMON)
 LOCAL_C_INCLUDES := $(LIBIOMX_INCLUDES_$(2))
 LOCAL_LDLIBS     := -L$(ANDROID_PRIVATE_LIBDIR)/$(TARGET_TUPLE) -llog -lhardware
-LOCAL_CFLAGS     := $(LIBIOMX_CFLAGS_COMMON) -DAPP_PLATFORM=$(2)
+LOCAL_CFLAGS     := $(LIBIOMX_CFLAGS_COMMON) -DANDROID_API=$(2)
 $(TARGET_OUT)/$(1).so: $(ANDROID_PRIVATE_LIBS)
 include $(BUILD_SHARED_LIBRARY)
 endef
 
-LIBANW_LIBS += libanw.10 libanw.13 libanw.14
-#libanw.18 libanw.21
+LIBANW_LIBS += libanw.10 libanw.13 libanw.14 libanw.18 libanw.21
 
 $(foreach ANW_MODULE,$(LIBANW_LIBS), \
     $(eval $(call build_anw,$(ANW_MODULE),$(subst libanw.,,$(ANW_MODULE)))))



More information about the Android mailing list