[Opencore-amr-commits] [vo-amrwbenc] Remove the LINUX define that isn't used any longer
Audio codecs extracted from Android Open Source Project
Brought to you by:
mstorsjo
From: Martin Storsjö <mst...@us...> - 2012-08-17 09:38:08
|
Module: vo-amrwbenc Branch: master Commit: bbe8cb99dc491175e19f2372f6512bc0d4b5474a Author: Martin Storsjo <ma...@ma...> Date: Thu Jun 23 13:54:11 2011 +0300 URL: http://opencore-amr.git.sf.net/git/gitweb.cgi?p=opencore-amr/vo-amrwbenc;a=commit;h=bbe8cb99dc491175e19f2372f6512bc0d4b5474a Remove the LINUX define that isn't used any longer --- amrwbenc/Android.mk | 2 -- amrwbenc/SampleCode/Android.mk | 2 +- common/Android.mk | 2 -- common/Config.mk | 2 -- 4 files changed, 1 insertions(+), 7 deletions(-) diff --git a/amrwbenc/Android.mk b/amrwbenc/Android.mk index 71a60d3..edfd7b7 100644 --- a/amrwbenc/Android.mk +++ b/amrwbenc/Android.mk @@ -101,8 +101,6 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/src \ $(LOCAL_PATH)/inc -LOCAL_CFLAGS := $(VO_CFLAGS) - ifeq ($(VOTT), v5) LOCAL_CFLAGS += -DARM -DASM_OPT LOCAL_C_INCLUDES += $(LOCAL_PATH)/src/asm/ARMV5E diff --git a/amrwbenc/SampleCode/Android.mk b/amrwbenc/SampleCode/Android.mk index 85ddceb..db34d08 100644 --- a/amrwbenc/SampleCode/Android.mk +++ b/amrwbenc/SampleCode/Android.mk @@ -10,7 +10,7 @@ LOCAL_MODULE := AMRWBEncTest LOCAL_ARM_MODE := arm -LOCAL_CFLAGS := $(VO_CFLAGS) +LOCAL_CFLAGS := -DLINUX LOCAL_SHARED_LIBRARIES := \ libstagefright \ diff --git a/common/Android.mk b/common/Android.mk index 77fe934..a33cb92 100644 --- a/common/Android.mk +++ b/common/Android.mk @@ -14,8 +14,6 @@ LOCAL_STATIC_LIBRARIES := LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/include -LOCAL_CFLAGS := $(VO_CFLAGS) - include $(BUILD_SHARED_LIBRARY) diff --git a/common/Config.mk b/common/Config.mk index 187f25c..a6d4286 100644 --- a/common/Config.mk +++ b/common/Config.mk @@ -20,5 +20,3 @@ endif VOTEST := 0 -VO_CFLAGS:=-DLINUX - |