From 3d2e853f86bda4b7b6efe41b69215e98fce79ce0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20Bostr=C3=B6m?= Date: Mon, 27 Jun 2016 19:47:12 +0200 Subject: [PATCH] Replace OS_ANDROID define to disable webrtc test. Replaces OS_ANDROID with WEBRTC_ANDROID to disable ProcessNoLossChangeFrameRateFrameDropVP9 on Android. BUG=webrtc:6057 R=danilchap@webrtc.org TBR=phoglund@webrtc.org Review URL: https://codereview.webrtc.org/2101673002 . Cr-Commit-Position: refs/heads/master@{#13300} --- .../video_coding/codecs/test/videoprocessor_integrationtest.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc b/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc index b9c78d6192..bdee84db6c 100644 --- a/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc +++ b/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc @@ -708,7 +708,7 @@ TEST_F(VideoProcessorIntegrationTest, ProcessNoLossChangeBitRateVP9) { // Note: quality after update should be higher but we currently compute quality // metrics averaged over whole sequence run. -#if defined(OS_ANDROID) +#if defined(WEBRTC_ANDROID) // Flaky on Android: https://bugs.chromium.org/p/webrtc/issues/detail?id=6057. #define MAYBE_ProcessNoLossChangeFrameRateFrameDropVP9 \ DISABLED_ProcessNoLossChangeFrameRateFrameDropVP9