From 7a281a563452715e48724b07725f2a2fa34dcca3 Mon Sep 17 00:00:00 2001 From: "andrew@webrtc.org" Date: Wed, 27 Jun 2012 03:22:37 +0000 Subject: [PATCH] Fix Android build after test/ -> src/test/ TBR=leozwang@webrtc.org BUG=none TEST=Android trybot Review URL: https://webrtc-codereview.appspot.com/677006 git-svn-id: http://webrtc.googlecode.com/svn/trunk@2447 4adac7df-926f-26a2-2b94-8c16560cd09d --- src/modules/audio_processing/Android.mk | 2 +- src/modules/audio_processing/test/unit_test.cc | 2 +- src/test/testsupport/fileutils.cc | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/modules/audio_processing/Android.mk b/src/modules/audio_processing/Android.mk index 7b2a49975..1dffd754c 100644 --- a/src/modules/audio_processing/Android.mk +++ b/src/modules/audio_processing/Android.mk @@ -112,7 +112,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 := \ diff --git a/src/modules/audio_processing/test/unit_test.cc b/src/modules/audio_processing/test/unit_test.cc index 0465ebc8e..b000f43a7 100644 --- a/src/modules/audio_processing/test/unit_test.cc +++ b/src/modules/audio_processing/test/unit_test.cc @@ -19,7 +19,7 @@ #include "module_common_types.h" #include "scoped_ptr.h" #include "signal_processing_library.h" -#include "testsupport/fileutils.h" +#include "test/testsupport/fileutils.h" #include "thread_wrapper.h" #include "trace.h" #ifdef WEBRTC_ANDROID_PLATFORM_BUILD diff --git a/src/test/testsupport/fileutils.cc b/src/test/testsupport/fileutils.cc index 530530867..bced4a767 100644 --- a/src/test/testsupport/fileutils.cc +++ b/src/test/testsupport/fileutils.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. + * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. * * Use of this source code is governed by a BSD-style license * that can be found in the LICENSE file in the root of the source @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "testsupport/fileutils.h" +#include "test/testsupport/fileutils.h" #ifdef WIN32 #include