Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1191287b authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am c3bfa026: Merge "aacenc/amrwbenc: Remove the now unused LINUX define" 

* commit 'c3bfa026':
  aacenc/amrwbenc: Remove the now unused LINUX define
parents eeb9fde0 c3bfa026

media/libstagefright/codecs/aacenc/Android.mk

+0 −2
Original line number Diff line number Diff line
@@ -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

media/libstagefright/codecs/aacenc/SampleCode/Android.mk

+0 −2
Original line number Diff line number Diff line
@@ -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

media/libstagefright/codecs/amrwbenc/Android.mk

+0 −2
Original line number Diff line number Diff line
@@ -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

media/libstagefright/codecs/amrwbenc/SampleCode/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ LOCAL_MODULE := AMRWBEncTest 


LOCAL_ARM_MODE := arm



LOCAL_CFLAGS := $(VO_CFLAGS)

LOCAL_CFLAGS := -DLINUX



LOCAL_SHARED_LIBRARIES := \

    libstagefright \

media/libstagefright/codecs/common/Android.mk

+0 −2
Original line number Diff line number Diff line
@@ -14,8 +14,6 @@ LOCAL_STATIC_LIBRARIES := 
LOCAL_C_INCLUDES := \

	$(LOCAL_PATH)/include



LOCAL_CFLAGS := $(VO_CFLAGS)



include $(BUILD_SHARED_LIBRARY)