Include "gtest/gtest.h", not by full path, on WEBRTC_ANDROID_PLATFORM_BUILD
BUG= TBR=andrew@webrtc.org Review URL: https://webrtc-codereview.appspot.com/1571004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@4119 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
parent
3496ef1087
commit
8c34ceeef1
@ -17,8 +17,6 @@
|
||||
|
||||
#include <algorithm>
|
||||
|
||||
#include "testing/gtest/include/gtest/gtest.h"
|
||||
|
||||
#include "webrtc/modules/audio_processing/include/audio_processing.h"
|
||||
#include "webrtc/modules/interface/module_common_types.h"
|
||||
#include "webrtc/system_wrappers/interface/cpu_features_wrapper.h"
|
||||
@ -27,8 +25,10 @@
|
||||
#include "webrtc/test/testsupport/fileutils.h"
|
||||
#include "webrtc/test/testsupport/perf_test.h"
|
||||
#ifdef WEBRTC_ANDROID_PLATFORM_BUILD
|
||||
#include "gtest/gtest.h"
|
||||
#include "external/webrtc/webrtc/modules/audio_processing/debug.pb.h"
|
||||
#else
|
||||
#include "testing/gtest/include/gtest/gtest.h"
|
||||
#include "webrtc/audio_processing/debug.pb.h"
|
||||
#endif
|
||||
|
||||
|
@ -13,8 +13,6 @@
|
||||
#include <algorithm>
|
||||
#include <queue>
|
||||
|
||||
#include "testing/gtest/include/gtest/gtest.h"
|
||||
|
||||
#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
|
||||
#include "webrtc/modules/audio_processing/include/audio_processing.h"
|
||||
#include "webrtc/modules/interface/module_common_types.h"
|
||||
@ -24,8 +22,10 @@
|
||||
#include "webrtc/system_wrappers/interface/trace.h"
|
||||
#include "webrtc/test/testsupport/fileutils.h"
|
||||
#ifdef WEBRTC_ANDROID_PLATFORM_BUILD
|
||||
#include "gtest/gtest.h"
|
||||
#include "external/webrtc/webrtc/modules/audio_processing/test/unittest.pb.h"
|
||||
#else
|
||||
#include "testing/gtest/include/gtest/gtest.h"
|
||||
#include "webrtc/audio_processing/unittest.pb.h"
|
||||
#endif
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user