aboutsummaryrefslogtreecommitdiff
path: root/Android.mk
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2014-03-13 11:44:57 -0700
committerYing Wang <wangying@google.com>2014-03-13 11:44:57 -0700
commit056a3c3e341f44edcd220608666644a5a14071b0 (patch)
treeb5eab883c95113edaf9b8ebc529ce52b8507c9b4 /Android.mk
parent48d24dc307f850add4e7314590f696721e8a42c1 (diff)
downloadwebrtc-056a3c3e341f44edcd220608666644a5a14071b0.tar.gz
Remove "../"s in LOCAL_SRC_FILES
"../" leads to object files spilling out of the module's intermediate directory and causes build race condition. Change-Id: I0f503b2ecca391b5255848e1ed6b56a898753ae8
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index 4b683374ce..5dbbc1d918 100644
--- a/Android.mk
+++ b/Android.mk
@@ -117,7 +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/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
@@ -132,5 +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/Android.mk
include $(webrtc_path)/src/common_audio/signal_processing/Android.mk