diff options
Diffstat (limited to 'media/libstagefright/codecs')
6 files changed, 1 insertions, 11 deletions
diff --git a/media/libstagefright/codecs/aacenc/Android.mk b/media/libstagefright/codecs/aacenc/Android.mk index 1c342c8..820734d 100644 --- a/media/libstagefright/codecs/aacenc/Android.mk +++ b/media/libstagefright/codecs/aacenc/Android.mk @@ -71,8 +71,6 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/inc \ $(LOCAL_PATH)/basic_op -LOCAL_CFLAGS := $(VO_CFLAGS) - ifeq ($(VOTT), v5) LOCAL_CFLAGS += -DARMV5E -DARM_INASM -DARMV5_INASM LOCAL_C_INCLUDES += $(LOCAL_PATH)/src/asm/ARMV5E diff --git a/media/libstagefright/codecs/aacenc/SampleCode/Android.mk b/media/libstagefright/codecs/aacenc/SampleCode/Android.mk index ba3f4d2..01016e7 100644 --- a/media/libstagefright/codecs/aacenc/SampleCode/Android.mk +++ b/media/libstagefright/codecs/aacenc/SampleCode/Android.mk @@ -5,8 +5,6 @@ LOCAL_SRC_FILES := \ AAC_E_SAMPLES.c \ ../../common/cmnMemory.c -LOCAL_CFLAGS += $(VO_CFLAGS) - LOCAL_MODULE_TAGS := debug LOCAL_MODULE := AACEncTest diff --git a/media/libstagefright/codecs/amrwbenc/Android.mk b/media/libstagefright/codecs/amrwbenc/Android.mk index 71a60d3..edfd7b7 100644 --- a/media/libstagefright/codecs/amrwbenc/Android.mk +++ b/media/libstagefright/codecs/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/media/libstagefright/codecs/amrwbenc/SampleCode/Android.mk b/media/libstagefright/codecs/amrwbenc/SampleCode/Android.mk index 85ddceb..db34d08 100644 --- a/media/libstagefright/codecs/amrwbenc/SampleCode/Android.mk +++ b/media/libstagefright/codecs/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/media/libstagefright/codecs/common/Android.mk b/media/libstagefright/codecs/common/Android.mk index 77fe934..a33cb92 100644 --- a/media/libstagefright/codecs/common/Android.mk +++ b/media/libstagefright/codecs/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/media/libstagefright/codecs/common/Config.mk b/media/libstagefright/codecs/common/Config.mk index 187f25c..a6d4286 100644 --- a/media/libstagefright/codecs/common/Config.mk +++ b/media/libstagefright/codecs/common/Config.mk @@ -20,5 +20,3 @@ endif VOTEST := 0 -VO_CFLAGS:=-DLINUX - |