[vlc-devel] [PATCH 04/12] build: remove unused defines

[Thomas Guillem]

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

diff --git a/libvlc/jni/Android.mk b/libvlc/jni/Android.mk
index b2032ab..b934244 100644
--- a/libvlc/jni/Android.mk
+++ b/libvlc/jni/Android.mk
@@ -84,34 +84,25 @@ include $(BUILD_SHARED_LIBRARY)
 
 # libiomx-* build
 
-LIBIOMX_SRC_FILES_COMMON := ../$(VLC_SRC_DIR)/modules/codec/omxil/iomx.cpp
 LIBIOMX_INCLUDES_COMMON := $(VLC_SRC_DIR)/modules/codec/omxil
-LIBIOMX_LDLIBS_COMMON := -L$(ANDROID_LIBS) -lgcc -lstagefright -lmedia -lutils -lbinder -llog -lcutils -lui
-LIBIOMX_CFLAGS_COMMON := -Wno-psabi
 
 # no hwbuffer for gingerbread
 LIBIOMX_INCLUDES_10 := $(LIBIOMX_INCLUDES_COMMON) \
 	$(ANDROID_SYS_HEADERS_GINGERBREAD)/frameworks/base/include \
 	$(ANDROID_SYS_HEADERS_GINGERBREAD)/system/core/include \
 	$(ANDROID_SYS_HEADERS_GINGERBREAD)/hardware/libhardware/include
-LIBIOMX_LDLIBS_10 := $(LIBIOMX_LDLIBS_COMMON)
-LIBIOMX_CFLAGS_10 := $(LIBIOMX_CFLAGS_COMMON)
 
 LIBIOMX_INCLUDES_13 := $(LIBIOMX_INCLUDES_COMMON) \
 	$(ANDROID_SYS_HEADERS_HC)/frameworks/base/include \
 	$(ANDROID_SYS_HEADERS_HC)/frameworks/base/native/include \
 	$(ANDROID_SYS_HEADERS_HC)/system/core/include \
 	$(ANDROID_SYS_HEADERS_HC)/hardware/libhardware/include
-LIBIOMX_LDLIBS_13 := $(LIBIOMX_LDLIBS_COMMON)
-LIBIOMX_CFLAGS_13 := $(LIBIOMX_CFLAGS_COMMON)
 
 LIBIOMX_INCLUDES_14 := $(LIBIOMX_INCLUDES_COMMON) \
 	$(ANDROID_SYS_HEADERS_ICS)/frameworks/base/include \
 	$(ANDROID_SYS_HEADERS_ICS)/frameworks/base/native/include \
 	$(ANDROID_SYS_HEADERS_ICS)/system/core/include \
 	$(ANDROID_SYS_HEADERS_ICS)/hardware/libhardware/include
-LIBIOMX_LDLIBS_14 := $(LIBIOMX_LDLIBS_COMMON) $(LIBIOMX_LDLIBS_HWBUFFER)
-LIBIOMX_CFLAGS_14 := $(LIBIOMX_CFLAGS_COMMON)
 
 LIBIOMX_SRC_FILES_18 := $(LIBIOMX_SRC_FILES_COMMON) $(LIBIOMX_SRC_FILES_HWBUFFER)
 LIBIOMX_INCLUDES_18 := $(LIBIOMX_INCLUDES_COMMON) \
@@ -119,8 +110,6 @@ LIBIOMX_INCLUDES_18 := $(LIBIOMX_INCLUDES_COMMON) \
 	$(ANDROID_SYS_HEADERS_JBMR2)/frameworks/av/include \
 	$(ANDROID_SYS_HEADERS_JBMR2)/system/core/include \
 	$(ANDROID_SYS_HEADERS_JBMR2)/hardware/libhardware/include
-LIBIOMX_LDLIBS_18 := $(LIBIOMX_LDLIBS_COMMON) $(LIBIOMX_LDLIBS_HWBUFFER)
-LIBIOMX_CFLAGS_18 := $(LIBIOMX_CFLAGS_COMMON) $(LIBIOMX_CFLAGS_HWBUFFER)
 
 LIBIOMX_SRC_FILES_19 := $(LIBIOMX_SRC_FILES_COMMON) $(LIBIOMX_SRC_FILES_HWBUFFER)
 LIBIOMX_INCLUDES_19 := $(LIBIOMX_INCLUDES_COMMON) \
@@ -128,16 +117,14 @@ LIBIOMX_INCLUDES_19 := $(LIBIOMX_INCLUDES_COMMON) \
 	$(ANDROID_SYS_HEADERS_KK)/frameworks/av/include \
 	$(ANDROID_SYS_HEADERS_KK)/system/core/include \
 	$(ANDROID_SYS_HEADERS_KK)/hardware/libhardware/include
-LIBIOMX_LDLIBS_19 := $(LIBIOMX_LDLIBS_COMMON) $(LIBIOMX_LDLIBS_HWBUFFER)
-LIBIOMX_CFLAGS_19 := $(LIBIOMX_CFLAGS_COMMON) $(LIBIOMX_CFLAGS_HWBUFFER)
 
 define build_iomx
 include $(CLEAR_VARS)
 LOCAL_MODULE := $(1)
-LOCAL_SRC_FILES  := $(LIBIOMX_SRC_FILES_COMMON)
+LOCAL_SRC_FILES  := ../$(VLC_SRC_DIR)/modules/codec/omxil/iomx.cpp
 LOCAL_C_INCLUDES := $(LIBIOMX_INCLUDES_$(2))
-LOCAL_LDLIBS     := $(LIBIOMX_LDLIBS_$(2))
-LOCAL_CFLAGS     := $(LIBIOMX_CFLAGS_$(2)) -DANDROID_API=$(2)
+LOCAL_LDLIBS     := -L$(ANDROID_LIBS) -lgcc -lstagefright -lmedia -lutils -lbinder -llog -lcutils -lui
+LOCAL_CFLAGS     := -Wno-psabi -DANDROID_API=$(2)
 include $(BUILD_SHARED_LIBRARY)
 endef
 
-- 
2.1.1