zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of d62aeac3 to master

Browse Source 
Change-Id: I0a7f0baa9054a957f88d87f463995737609d569b
This commit is contained in:
Narayan Kamath
2014-03-14 10:38:38 +00:00
parent 5eafe7b801 d62aeac391
commit 49b9845aea
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Android.mk
View File

@ -117,8 +117,7 @@ webrtc_path := $(LOCAL_PATH)
include $(webrtc_path)/src/common_audio/resampler/Android.mk
include $(webrtc_path)/src/common_audio/signal_processing/Android.mk
include $(webrtc_path)/src/common_audio/vad/Android.mk
include $(webrtc_path)/src/modules/audio_coding/codecs/isac/fix/source/Android.mk
include $(webrtc_path)/src/modules/audio_coding/codecs/isac/fix/test/Android.mk
include $(webrtc_path)/src/modules/audio_coding/codecs/isac/fix/Android.mk
include $(webrtc_path)/src/modules/audio_coding/codecs/isac/main/source/Android.mk
include $(webrtc_path)/src/modules/audio_processing/aec/Android.mk
include $(webrtc_path)/src/modules/audio_processing/aecm/Android.mk
@ -133,6 +132,5 @@ include $(webrtc_path)/src/system_wrappers/source/Android.mk
WEBRTC_STL := gnustl_static
include $(webrtc_path)/src/system_wrappers/source/Android.mk
include $(webrtc_path)/src/modules/audio_coding/codecs/isac/main/source/Android.mk
include $(webrtc_path)/src/modules/audio_coding/codecs/isac/fix/source/Android.mk
include $(webrtc_path)/src/modules/audio_coding/codecs/isac/fix/test/Android.mk
include $(webrtc_path)/src/modules/audio_coding/codecs/isac/fix/Android.mk
include $(webrtc_path)/src/common_audio/signal_processing/Android.mk

3
src/modules/audio_coding/codecs/isac/fix/Android.mk Normal file
View File

@ -0,0 +1,3 @@
LOCAL_PATH := $(call my-dir)
include $(call all-makefiles-under,$(LOCAL_PATH))

4
src/modules/audio_processing/Android.mk
View File

@ -141,7 +141,7 @@ LOCAL_CPP_EXTENSION := .cc
LOCAL_SRC_FILES:= \
$(call all-proto-files-under, test) \
test/unit_test.cc \
../../../test/testsupport/fileutils.cc
test/testsupport/fileutils.cc
# Flags passed to both C and C++ files.
LOCAL_CFLAGS := \
@ -159,7 +159,7 @@ LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/interface \
$(LOCAL_PATH)/../interface \
$(LOCAL_PATH)/../.. \
$(LOCAL_PATH)/../../../test \
$(LOCAL_PATH)/test \
$(LOCAL_PATH)/../../system_wrappers/interface \
$(LOCAL_PATH)/../../common_audio/signal_processing/include \
external/gtest/include \

1
src/modules/audio_processing/test/testsupport Symbolic link
View File

@ -0,0 +1 @@
../../../../test/testsupport