diff options
| author | Ying Wang <wangying@google.com> | 2014-03-01 02:09:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-03-01 02:09:45 +0000 |
| commit | a688b4b849213134f495a9abff1a39305e5a9c54 (patch) | |
| tree | 920bf1f70994e24ca699af11ca7bdfa101692d7a | |
| parent | 148d5389f1c24942f0c8e5d011a2c8d123f817c9 (diff) | |
| parent | 789c38cf1a86b5a33e03aac9d1a101d3b3927e98 (diff) | |
| download | webrtc-a688b4b849213134f495a9abff1a39305e5a9c54.tar.gz | |
Merge "Fix misuse of $(my-dir)."
| -rw-r--r-- | Android.mk | 54 |
1 files changed, 26 insertions, 28 deletions
diff --git a/Android.mk b/Android.mk index 8faadaa14f..5093a88e50 100644 --- a/Android.mk +++ b/Android.mk @@ -6,35 +6,10 @@ # in the file PATENTS. All contributing project authors may # be found in the AUTHORS file in the root of the source tree. -MY_WEBRTC_ROOT_PATH := $(call my-dir) - -# voice -include $(MY_WEBRTC_ROOT_PATH)/src/common_audio/resampler/Android.mk -include $(MY_WEBRTC_ROOT_PATH)/src/common_audio/signal_processing/Android.mk -include $(MY_WEBRTC_ROOT_PATH)/src/common_audio/vad/Android.mk -include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/isac/fix/source/Android.mk -include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/isac/main/source/Android.mk -include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/aec/Android.mk -include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/aecm/Android.mk -include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/agc/Android.mk -include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/Android.mk -include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/ns/Android.mk -include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/utility/Android.mk -#include $(MY_WEBRTC_ROOT_PATH)/src/modules/utility/source/Android.mk -include $(MY_WEBRTC_ROOT_PATH)/src/system_wrappers/source/Android.mk - -# libwebrtc_audio_coding_gnustl_static dependencies -WEBRTC_STL := gnustl_static -include $(MY_WEBRTC_ROOT_PATH)/src/system_wrappers/source/Android.mk -include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/isac/main/source/Android.mk -include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/isac/fix/source/Android.mk -include $(MY_WEBRTC_ROOT_PATH)/src/common_audio/signal_processing/Android.mk - -# build .so LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -include $(LOCAL_PATH)/../../external/webrtc/android-webrtc.mk +include $(LOCAL_PATH)/android-webrtc.mk LOCAL_ARM_MODE := arm LOCAL_MODULE := libwebrtc_audio_preprocessing @@ -76,7 +51,7 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) -include $(LOCAL_PATH)/../../external/webrtc/android-webrtc.mk +include $(LOCAL_PATH)/android-webrtc.mk LOCAL_ARM_MODE := arm LOCAL_MODULE := libwebrtc_audio_coding @@ -108,7 +83,7 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) -include $(LOCAL_PATH)/../../external/webrtc/android-webrtc.mk +include $(LOCAL_PATH)/android-webrtc.mk LOCAL_ARM_MODE := arm LOCAL_MODULE := libwebrtc_audio_coding_gnustl_static @@ -136,3 +111,26 @@ LOCAL_NDK_STL_VARIANT := gnustl_static LOCAL_SDK_VERSION := 14 include $(BUILD_STATIC_LIBRARY) + +webrtc_path := $(LOCAL_PATH) +# voice +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/main/source/Android.mk +include $(webrtc_path)/src/modules/audio_processing/aec/Android.mk +include $(webrtc_path)/src/modules/audio_processing/aecm/Android.mk +include $(webrtc_path)/src/modules/audio_processing/agc/Android.mk +include $(webrtc_path)/src/modules/audio_processing/Android.mk +include $(webrtc_path)/src/modules/audio_processing/ns/Android.mk +include $(webrtc_path)/src/modules/audio_processing/utility/Android.mk +#include $(webrtc_path)/src/modules/utility/source/Android.mk +include $(webrtc_path)/src/system_wrappers/source/Android.mk + +# libwebrtc_audio_coding_gnustl_static dependencies +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/common_audio/signal_processing/Android.mk |