generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change android makefile to build webrtc for android/x86 as well

Browse Source 
Review URL: http://webrtc-codereview.appspot.com/68002

git-svn-id: http://webrtc.googlecode.com/svn/trunk@208 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
leozwang@google.com 2011-07-14 18:25:35 +00:00
parent 3c0a86f83d
commit 43ea04236b
5 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/modules/audio_processing/aec/main/source/Android.mk
View File

@ -16,9 +16,9 @@ LOCAL_MODULE_TAGS := optional
LOCAL_GENERATED_SOURCES := LOCAL_GENERATED_SOURCES :=
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
echo_cancellation.c \ echo_cancellation.c \
resampler.c \
aec_core.c \ aec_core.c \
aec_rdft.c \ aec_rdft.c
resampler.c
# Flags passed to both C and C++ files. # Flags passed to both C and C++ files.
MY_CFLAGS := MY_CFLAGS :=
@ -27,9 +27,16 @@ MY_DEFS := '-DNO_TCMALLOC' \
'-DNO_HEAPCHECKER' \ '-DNO_HEAPCHECKER' \
'-DWEBRTC_TARGET_PC' \ '-DWEBRTC_TARGET_PC' \
'-DWEBRTC_LINUX' \ '-DWEBRTC_LINUX' \
'-DWEBRTC_THREAD_RR' \ '-DWEBRTC_THREAD_RR'
ifeq ($(TARGET_ARCH),arm)
MY_DEFS += \
'-DWEBRTC_ANDROID' \ '-DWEBRTC_ANDROID' \
'-DANDROID' '-DANDROID'
else
LOCAL_SRC_FILES += \
aec_core_sse2.c \
aec_rdft_sse2.c
endif
LOCAL_CFLAGS := $(MY_CFLAGS_C) $(MY_CFLAGS) $(MY_DEFS) LOCAL_CFLAGS := $(MY_CFLAGS_C) $(MY_CFLAGS) $(MY_DEFS)
# Include paths placed before CFLAGS/CPPFLAGS # Include paths placed before CFLAGS/CPPFLAGS

5
src/modules/audio_processing/aecm/main/source/Android.mk
View File

@ -25,9 +25,12 @@ MY_DEFS := '-DNO_TCMALLOC' \
'-DNO_HEAPCHECKER' \ '-DNO_HEAPCHECKER' \
'-DWEBRTC_TARGET_PC' \ '-DWEBRTC_TARGET_PC' \
'-DWEBRTC_LINUX' \ '-DWEBRTC_LINUX' \
'-DWEBRTC_THREAD_RR' \ '-DWEBRTC_THREAD_RR'
ifeq ($(TARGET_ARCH),arm)
MY_DEFS += \
'-DWEBRTC_ANDROID' \ '-DWEBRTC_ANDROID' \
'-DANDROID' '-DANDROID'
endif
LOCAL_CFLAGS := $(MY_CFLAGS_C) $(MY_CFLAGS) $(MY_DEFS) LOCAL_CFLAGS := $(MY_CFLAGS_C) $(MY_CFLAGS) $(MY_DEFS)
# Include paths placed before CFLAGS/CPPFLAGS # Include paths placed before CFLAGS/CPPFLAGS

5
src/modules/audio_processing/agc/main/source/Android.mk
View File

@ -19,9 +19,12 @@ MY_DEFS := '-DNO_TCMALLOC' \
'-DNO_HEAPCHECKER' \ '-DNO_HEAPCHECKER' \
'-DWEBRTC_TARGET_PC' \ '-DWEBRTC_TARGET_PC' \
'-DWEBRTC_LINUX' \ '-DWEBRTC_LINUX' \
'-DWEBRTC_THREAD_RR' \ '-DWEBRTC_THREAD_RR'
ifeq ($(TARGET_ARCH),arm)
MY_DEFS += \
'-DWEBRTC_ANDROID' \ '-DWEBRTC_ANDROID' \
'-DANDROID' '-DANDROID'
endif
LOCAL_CFLAGS := $(MY_CFLAGS_C) $(MY_CFLAGS) $(MY_DEFS) LOCAL_CFLAGS := $(MY_CFLAGS_C) $(MY_CFLAGS) $(MY_DEFS)
# Include paths placed before CFLAGS/CPPFLAGS # Include paths placed before CFLAGS/CPPFLAGS

7
src/modules/audio_processing/main/source/Android.mk
View File

@ -35,11 +35,14 @@ MY_DEFS := '-DNO_TCMALLOC' \
'-DWEBRTC_TARGET_PC' \ '-DWEBRTC_TARGET_PC' \
'-DWEBRTC_LINUX' \ '-DWEBRTC_LINUX' \
'-DWEBRTC_THREAD_RR' \ '-DWEBRTC_THREAD_RR' \
'-DWEBRTC_ANDROID' \
'-DANDROID' \
'-DWEBRTC_NS_FIXED' '-DWEBRTC_NS_FIXED'
# floating point # floating point
# -DWEBRTC_NS_FLOAT' # -DWEBRTC_NS_FLOAT'
ifeq ($(TARGET_ARCH),arm)
MY_DEFS += \
'-DWEBRTC_ANDROID' \
'-DANDROID'
endif
LOCAL_CFLAGS := $(MY_CFLAGS_C) $(MY_CFLAGS) $(MY_DEFS) LOCAL_CFLAGS := $(MY_CFLAGS_C) $(MY_CFLAGS) $(MY_DEFS)
# Include paths placed before CFLAGS/CPPFLAGS # Include paths placed before CFLAGS/CPPFLAGS

6
src/modules/audio_processing/ns/main/source/Android.mk
View File

@ -22,10 +22,12 @@ MY_DEFS := '-DNO_TCMALLOC' \
'-DNO_HEAPCHECKER' \ '-DNO_HEAPCHECKER' \
'-DWEBRTC_TARGET_PC' \ '-DWEBRTC_TARGET_PC' \
'-DWEBRTC_LINUX' \ '-DWEBRTC_LINUX' \
'-DWEBRTC_THREAD_RR' \ '-DWEBRTC_THREAD_RR'
ifeq ($(TARGET_ARCH),arm)
MY_DEFS += \
'-DWEBRTC_ANDROID' \ '-DWEBRTC_ANDROID' \
'-DANDROID' '-DANDROID'
endif
LOCAL_CFLAGS := $(MY_CFLAGS_C) $(MY_CFLAGS) $(MY_DEFS) LOCAL_CFLAGS := $(MY_CFLAGS_C) $(MY_CFLAGS) $(MY_DEFS)
# Include paths placed before CFLAGS/CPPFLAGS # Include paths placed before CFLAGS/CPPFLAGS