diff options
author | Ying Wang <wangying@google.com> | 2014-05-31 11:44:04 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-31 11:44:04 +0000 |
commit | 7d08864492fbdfd9ace79d3f03537c583180c837 (patch) | |
tree | 1be5e7190b3605b65af064bcc800470252afbd0a | |
parent | 148d5389f1c24942f0c8e5d011a2c8d123f817c9 (diff) | |
parent | 053904f5dfafecd068135af3bce8e45874cfc530 (diff) | |
download | webrtc-7d08864492fbdfd9ace79d3f03537c583180c837.tar.gz |
am 053904f5: Remove "../"s in LOCAL_SRC_FILES [DO NOT MERGE]
* commit '053904f5dfafecd068135af3bce8e45874cfc530':
Remove "../"s in LOCAL_SRC_FILES [DO NOT MERGE]
-rw-r--r-- | Android.mk | 4 | ||||
-rw-r--r-- | src/modules/audio_coding/codecs/isac/fix/Android.mk | 3 | ||||
-rw-r--r-- | src/modules/audio_coding/codecs/isac/fix/source/Android.mk | 51 | ||||
-rw-r--r-- | src/modules/audio_coding/codecs/isac/fix/test/Android.mk | 52 | ||||
-rw-r--r-- | src/modules/audio_processing/Android.mk | 4 | ||||
l--------- | src/modules/audio_processing/test/testsupport | 1 |
6 files changed, 60 insertions, 55 deletions
diff --git a/Android.mk b/Android.mk index 8faadaa14f..1720a24db5 100644 --- a/Android.mk +++ b/Android.mk @@ -12,7 +12,7 @@ MY_WEBRTC_ROOT_PATH := $(call my-dir) 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/fix/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 @@ -27,7 +27,7 @@ include $(MY_WEBRTC_ROOT_PATH)/src/system_wrappers/source/Android.mk 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/modules/audio_coding/codecs/isac/fix/Android.mk include $(MY_WEBRTC_ROOT_PATH)/src/common_audio/signal_processing/Android.mk # build .so 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_coding/codecs/isac/fix/source/Android.mk b/src/modules/audio_coding/codecs/isac/fix/source/Android.mk index 2794a9ca21..f6ad4d46e7 100644 --- a/src/modules/audio_coding/codecs/isac/fix/source/Android.mk +++ b/src/modules/audio_coding/codecs/isac/fix/source/Android.mk @@ -129,54 +129,3 @@ endif include $(BUILD_STATIC_LIBRARY) endif # ifeq ($(WEBRTC_BUILD_NEON_LIBS),true) - -########################### -# isac test app - -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := tests -LOCAL_CPP_EXTENSION := .cc -LOCAL_SRC_FILES:= ../test/kenny.c - -# Flags passed to both C and C++ files. -LOCAL_CFLAGS := $(MY_WEBRTC_COMMON_DEFS) - -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/../interface \ - $(LOCAL_PATH)/../../../../../.. - -MY_LIB_SUFFIX := -ifdef WEBRTC_STL -MY_LIB_SUFFIX := _$(WEBRTC_STL) -endif - -LOCAL_STATIC_LIBRARIES := \ - libwebrtc_isacfix$(MY_LIB_SUFFIX) \ - libwebrtc_spl$(MY_LIB_SUFFIX) \ - libwebrtc_system_wrappers$(MY_LIB_SUFFIX) - -ifeq ($(WEBRTC_BUILD_NEON_LIBS),true) -LOCAL_STATIC_LIBRARIES += \ - libwebrtc_isacfix_neon$(MY_LIB_SUFFIX) -endif - -LOCAL_SHARED_LIBRARIES := \ - libutils - -LOCAL_MODULE:= webrtc_isac_test - -ifdef NDK_ROOT -include $(BUILD_EXECUTABLE) -else -ifndef WEBRTC_STL -LOCAL_SHARED_LIBRARIES += libstlport -include external/stlport/libstlport.mk -else -LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL) -LOCAL_SDK_VERSION := 14 -LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL) -LOCAL_SHARED_LIBRARIES := -endif -include $(BUILD_NATIVE_TEST) -endif diff --git a/src/modules/audio_coding/codecs/isac/fix/test/Android.mk b/src/modules/audio_coding/codecs/isac/fix/test/Android.mk new file mode 100644 index 0000000000..fc8c193a1d --- /dev/null +++ b/src/modules/audio_coding/codecs/isac/fix/test/Android.mk @@ -0,0 +1,52 @@ +LOCAL_PATH := $(call my-dir) + +########################### +# isac test app + +include $(CLEAR_VARS) + +LOCAL_MODULE_TAGS := tests +LOCAL_CPP_EXTENSION := .cc +LOCAL_SRC_FILES:= kenny.c + +# Flags passed to both C and C++ files. +LOCAL_CFLAGS := $(MY_WEBRTC_COMMON_DEFS) + +LOCAL_C_INCLUDES := \ + $(LOCAL_PATH)/../interface \ + $(LOCAL_PATH)/../../../../../.. + +MY_LIB_SUFFIX := +ifdef WEBRTC_STL +MY_LIB_SUFFIX := _$(WEBRTC_STL) +endif + +LOCAL_STATIC_LIBRARIES := \ + libwebrtc_isacfix$(MY_LIB_SUFFIX) \ + libwebrtc_spl$(MY_LIB_SUFFIX) \ + libwebrtc_system_wrappers$(MY_LIB_SUFFIX) + +ifeq ($(WEBRTC_BUILD_NEON_LIBS),true) +LOCAL_STATIC_LIBRARIES += \ + libwebrtc_isacfix_neon$(MY_LIB_SUFFIX) +endif + +LOCAL_SHARED_LIBRARIES := \ + libutils + +LOCAL_MODULE:= webrtc_isac_test + +ifdef NDK_ROOT +include $(BUILD_EXECUTABLE) +else +ifndef WEBRTC_STL +LOCAL_SHARED_LIBRARIES += libstlport +include external/stlport/libstlport.mk +else +LOCAL_NDK_STL_VARIANT := $(WEBRTC_STL) +LOCAL_SDK_VERSION := 14 +LOCAL_MODULE := $(LOCAL_MODULE)_$(WEBRTC_STL) +LOCAL_SHARED_LIBRARIES := +endif +include $(BUILD_NATIVE_TEST) +endif diff --git a/src/modules/audio_processing/Android.mk b/src/modules/audio_processing/Android.mk index b784708f51..fd283c1e94 100644 --- a/src/modules/audio_processing/Android.mk +++ b/src/modules/audio_processing/Android.mk @@ -127,7 +127,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 := \ @@ -138,7 +138,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 |