diff options
| author | Narayan Kamath <narayan@google.com> | 2014-03-14 10:38:38 +0000 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2014-03-14 10:39:53 +0000 |
| commit | 49b9845aea12d85dd92eff2604a6756db08cd855 (patch) | |
| tree | b51a99d5bd3e0fbdf8f58dc7cbf77f19b2ef072e | |
| parent | 5eafe7b801e143e31298c9ba564baee7139b7049 (diff) | |
| parent | d62aeac391d16d4953a12120c0ff614ccde02a30 (diff) | |
| download | webrtc-49b9845aea12d85dd92eff2604a6756db08cd855.tar.gz | |
resolved conflicts for merge of d62aeac3 to master
Change-Id: I0a7f0baa9054a957f88d87f463995737609d569b
| -rw-r--r-- | Android.mk | 6 | ||||
| -rw-r--r-- | src/modules/audio_coding/codecs/isac/fix/Android.mk | 3 | ||||
| -rw-r--r-- | src/modules/audio_processing/Android.mk | 4 | ||||
| l--------- | src/modules/audio_processing/test/testsupport | 1 |
4 files changed, 8 insertions, 6 deletions
diff --git a/Android.mk b/Android.mk index a6edb3d873..5dbbc1d918 100644 --- a/Android.mk +++ b/Android.mk @@ -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 diff --git a/src/modules/audio_coding/codecs/isac/fix/Android.mk b/src/modules/audio_coding/codecs/isac/fix/Android.mk new file mode 100644 index 0000000000..7a16792d14 --- /dev/null +++ b/src/modules/audio_coding/codecs/isac/fix/Android.mk @@ -0,0 +1,3 @@ +LOCAL_PATH := $(call my-dir) + +include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/src/modules/audio_processing/Android.mk b/src/modules/audio_processing/Android.mk index 37b8054705..8f6bddee9e 100644 --- a/src/modules/audio_processing/Android.mk +++ b/src/modules/audio_processing/Android.mk @@ -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 \ diff --git a/src/modules/audio_processing/test/testsupport b/src/modules/audio_processing/test/testsupport new file mode 120000 index 0000000000..d96ec34e8a --- /dev/null +++ b/src/modules/audio_processing/test/testsupport @@ -0,0 +1 @@ +../../../../test/testsupport
\ No newline at end of file |