Merge "Remove "../"s in LOCAL_SRC_FILES"idea133-weekly-release

6 files changed, 70 insertions, 65 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
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 f64ca2a43d..75748e5469 100644
--- a/src/modules/audio_coding/codecs/isac/fix/source/Android.mk
+++ b/src/modules/audio_coding/codecs/isac/fix/source/Android.mk
@@ -142,64 +142,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_CFLAGS_arm := $(MY_WEBRTC_COMMON_DEFS_arm)
-LOCAL_CFLAGS_x86 := $(MY_WEBRTC_COMMON_DEFS_x86)
-LOCAL_CFLAGS_mips := $(MY_WEBRTC_COMMON_DEFS_mips)
-LOCAL_CFLAGS_arm64 := $(MY_WEBRTC_COMMON_DEFS_arm64)
-LOCAL_CFLAGS_x86_64 := $(MY_WEBRTC_COMMON_DEFS_x86_64)
-LOCAL_CFLAGS_mips64 := $(MY_WEBRTC_COMMON_DEFS_mips64)
-
-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)
-# We need to dup libwebrtc_isacfix$(MY_LIB_SUFFIX) because ibwebrtc_isacfix_neon$(MY_LIB_SUFFIX)
-# has dependency on it.
-LOCAL_STATIC_LIBRARIES_arm += \
-    libwebrtc_isacfix$(MY_LIB_SUFFIX) \
-    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..d8e685f19d
--- /dev/null
+++ b/src/modules/audio_coding/codecs/isac/fix/test/Android.mk
@@ -0,0 +1,62 @@
+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_CFLAGS_arm := $(MY_WEBRTC_COMMON_DEFS_arm)
+LOCAL_CFLAGS_x86 := $(MY_WEBRTC_COMMON_DEFS_x86)
+LOCAL_CFLAGS_mips := $(MY_WEBRTC_COMMON_DEFS_mips)
+LOCAL_CFLAGS_arm64 := $(MY_WEBRTC_COMMON_DEFS_arm64)
+LOCAL_CFLAGS_x86_64 := $(MY_WEBRTC_COMMON_DEFS_x86_64)
+LOCAL_CFLAGS_mips64 := $(MY_WEBRTC_COMMON_DEFS_mips64)
+
+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)
+# We need to dup libwebrtc_isacfix$(MY_LIB_SUFFIX) because ibwebrtc_isacfix_neon$(MY_LIB_SUFFIX)
+# has dependency on it.
+LOCAL_STATIC_LIBRARIES_arm += \
+    libwebrtc_isacfix$(MY_LIB_SUFFIX) \
+    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 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