From e6e139159f79b1cb2a86d4f023d0dd92febc3ec0 Mon Sep 17 00:00:00 2001 From: "henrike@webrtc.org" Date: Wed, 4 Jun 2014 20:46:50 +0000 Subject: [PATCH] Android: cleanup gtest_target_type conditions. Ever since crrev.com/133053 OS==android implies: gtest_target_type=shared_library Similar to Chromium's crrev.com/271222 where base.gyp's conditions are changed (which the affected conditions in this cl comes from). R=henrike@webrtc.org, wu@webrtc.org Review URL: https://webrtc-codereview.appspot.com/13539004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@6332 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/common_audio/common_audio.gyp | 4 ++-- webrtc/common_video/common_video_unittests.gyp | 4 ++-- .../audio_coding/codecs/tools/audio_codec_speed_tests.gypi | 4 ++-- webrtc/modules/audio_coding/neteq4/neteq.gypi | 4 ++-- webrtc/modules/modules.gyp | 6 +++--- webrtc/modules/video_capture/video_capture.gypi | 4 ++-- webrtc/system_wrappers/source/system_wrappers_tests.gyp | 4 ++-- webrtc/test/test.gyp | 6 +++--- webrtc/tools/tools.gyp | 4 ++-- webrtc/video_engine/video_engine_core.gypi | 4 ++-- webrtc/voice_engine/voice_engine.gyp | 4 ++-- webrtc/webrtc_tests.gypi | 6 +++--- 12 files changed, 27 insertions(+), 27 deletions(-) diff --git a/webrtc/common_audio/common_audio.gyp b/webrtc/common_audio/common_audio.gyp index c3f141b444..3bed4e4d80 100644 --- a/webrtc/common_audio/common_audio.gyp +++ b/webrtc/common_audio/common_audio.gyp @@ -215,7 +215,7 @@ 'conditions': [ # TODO(henrike): remove build_with_chromium==1 when the bots are # using Chromium's buildbots. - ['build_with_chromium==1 and OS=="android" and gtest_target_type=="shared_library"', { + ['build_with_chromium==1 and OS=="android"', { 'dependencies': [ '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code', ], @@ -226,7 +226,7 @@ 'conditions': [ # TODO(henrike): remove build_with_chromium==1 when the bots are using # Chromium's buildbots. - ['build_with_chromium==1 and OS=="android" and gtest_target_type=="shared_library"', { + ['build_with_chromium==1 and OS=="android"', { 'targets': [ { 'target_name': 'common_audio_unittests_apk_target', diff --git a/webrtc/common_video/common_video_unittests.gyp b/webrtc/common_video/common_video_unittests.gyp index 9523361cda..91a11edacb 100644 --- a/webrtc/common_video/common_video_unittests.gyp +++ b/webrtc/common_video/common_video_unittests.gyp @@ -32,7 +32,7 @@ 'conditions': [ # TODO(henrike): remove build_with_chromium==1 when the bots are # using Chromium's buildbots. - ['build_with_chromium==1 and OS=="android" and gtest_target_type=="shared_library"', { + ['build_with_chromium==1 and OS=="android"', { 'dependencies': [ '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code', ], @@ -43,7 +43,7 @@ 'conditions': [ # TODO(henrike): remove build_with_chromium==1 when the bots are using # Chromium's buildbots. - ['build_with_chromium==1 and OS=="android" and gtest_target_type=="shared_library"', { + ['build_with_chromium==1 and OS=="android"', { 'targets': [ { 'target_name': 'common_video_unittests_apk_target', diff --git a/webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_tests.gypi b/webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_tests.gypi index 4d746e0107..4d675e10cf 100644 --- a/webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_tests.gypi +++ b/webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_tests.gypi @@ -28,7 +28,7 @@ 'conditions': [ # TODO(henrike): remove build_with_chromium==1 when the bots are # using Chromium's buildbots. - ['build_with_chromium==1 and OS=="android" and gtest_target_type=="shared_library"', { + ['build_with_chromium==1 and OS=="android"', { 'dependencies': [ '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code', ], @@ -38,7 +38,7 @@ 'conditions': [ # TODO(henrike): remove build_with_chromium==1 when the bots are using # Chromium's buildbots. - ['build_with_chromium==1 and OS=="android" and gtest_target_type=="shared_library"', { + ['build_with_chromium==1 and OS=="android"', { 'targets': [ { 'target_name': 'audio_codec_speed_tests_apk_target', diff --git a/webrtc/modules/audio_coding/neteq4/neteq.gypi b/webrtc/modules/audio_coding/neteq4/neteq.gypi index 84794c9e06..280e51181b 100644 --- a/webrtc/modules/audio_coding/neteq4/neteq.gypi +++ b/webrtc/modules/audio_coding/neteq4/neteq.gypi @@ -159,7 +159,7 @@ 'conditions': [ # TODO(henrike): remove build_with_chromium==1 when the bots are # using Chromium's buildbots. - ['build_with_chromium==1 and OS=="android" and gtest_target_type=="shared_library"', { + ['build_with_chromium==1 and OS=="android"', { 'dependencies': [ '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code', ], @@ -199,7 +199,7 @@ 'conditions': [ # TODO(henrike): remove build_with_chromium==1 when the bots are using # Chromium's buildbots. - ['build_with_chromium==1 and OS=="android" and gtest_target_type=="shared_library"', { + ['build_with_chromium==1 and OS=="android"', { 'targets': [ { 'target_name': 'audio_decoder_unittests_apk_target', diff --git a/webrtc/modules/modules.gyp b/webrtc/modules/modules.gyp index 10fa7ba6de..701ee77005 100644 --- a/webrtc/modules/modules.gyp +++ b/webrtc/modules/modules.gyp @@ -297,7 +297,7 @@ }], # TODO(henrike): remove build_with_chromium==1 when the bots are # using Chromium's buildbots. - ['build_with_chromium==1 and OS=="android" and gtest_target_type=="shared_library"', { + ['build_with_chromium==1 and OS=="android"', { 'dependencies': [ '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code', ], @@ -358,7 +358,7 @@ 'conditions': [ # TODO(henrike): remove build_with_chromium==1 when the bots are # using Chromium's buildbots. - ['build_with_chromium==1 and OS=="android" and gtest_target_type=="shared_library"', { + ['build_with_chromium==1 and OS=="android"', { 'dependencies': [ '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code', ], @@ -369,7 +369,7 @@ 'conditions': [ # TODO(henrike): remove build_with_chromium==1 when the bots are using # Chromium's buildbots. - ['build_with_chromium==1 and OS=="android" and gtest_target_type=="shared_library"', { + ['build_with_chromium==1 and OS=="android"', { 'targets': [ { 'target_name': 'modules_unittests_apk_target', diff --git a/webrtc/modules/video_capture/video_capture.gypi b/webrtc/modules/video_capture/video_capture.gypi index b13b27b370..dced22ce08 100644 --- a/webrtc/modules/video_capture/video_capture.gypi +++ b/webrtc/modules/video_capture/video_capture.gypi @@ -134,7 +134,7 @@ }, ], 'conditions': [ - ['include_tests==1 and build_with_chromium==1 and OS=="android" and gtest_target_type=="shared_library"', { + ['include_tests==1 and build_with_chromium==1 and OS=="android"', { # Use WebRTC capture code for Android APK tests that are built from a # Chromium checkout. Normally when built as a part of Chromium the # Chromium video capture code is used. This overrides the default in @@ -178,7 +178,7 @@ }], # TODO(henrike): remove build_with_chromium==1 when the bots are # using Chromium's buildbots. - ['build_with_chromium==1 and OS=="android" and gtest_target_type=="shared_library"', { + ['build_with_chromium==1 and OS=="android"', { 'dependencies': [ '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code', ], diff --git a/webrtc/system_wrappers/source/system_wrappers_tests.gyp b/webrtc/system_wrappers/source/system_wrappers_tests.gyp index 59eef3650a..f2f6156691 100644 --- a/webrtc/system_wrappers/source/system_wrappers_tests.gyp +++ b/webrtc/system_wrappers/source/system_wrappers_tests.gyp @@ -48,7 +48,7 @@ }], # TODO(henrike): remove build_with_chromium==1 when the bots are # using Chromium's buildbots. - ['build_with_chromium==1 and OS=="android" and gtest_target_type=="shared_library"', { + ['build_with_chromium==1 and OS=="android"', { 'dependencies': [ '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code', ], @@ -63,7 +63,7 @@ 'conditions': [ # TODO(henrike): remove build_with_chromium==1 when the bots are using # Chromium's buildbots. - ['include_tests==1 and build_with_chromium==1 and OS=="android" and gtest_target_type=="shared_library"', { + ['include_tests==1 and build_with_chromium==1 and OS=="android"', { 'targets': [ { 'target_name': 'system_wrappers_unittests_apk_target', diff --git a/webrtc/test/test.gyp b/webrtc/test/test.gyp index feca0b28e5..69776e7b92 100644 --- a/webrtc/test/test.gyp +++ b/webrtc/test/test.gyp @@ -117,7 +117,7 @@ 'conditions': [ # TODO(henrike): remove build_with_chromium==1 when the bots are using # Chromium's buildbots. - ['build_with_chromium==1 and OS=="android" and gtest_target_type=="shared_library"', { + ['build_with_chromium==1 and OS=="android"', { 'dependencies': [ '<(DEPTH)/base/base.gyp:base', ], @@ -193,7 +193,7 @@ 'conditions': [ # TODO(henrike): remove build_with_chromium==1 when the bots are # using Chromium's buildbots. - ['build_with_chromium==1 and OS=="android" and gtest_target_type=="shared_library"', { + ['build_with_chromium==1 and OS=="android"', { 'dependencies': [ '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code', ], @@ -228,7 +228,7 @@ }], # TODO(henrike): remove build_with_chromium==1 when the bots are using # Chromium's buildbots. - ['include_tests==1 and build_with_chromium==1 and OS=="android" and gtest_target_type=="shared_library"', { + ['include_tests==1 and build_with_chromium==1 and OS=="android"', { 'targets': [ { 'target_name': 'test_support_unittests_apk_target', diff --git a/webrtc/tools/tools.gyp b/webrtc/tools/tools.gyp index 77238095d9..ee2a11d450 100644 --- a/webrtc/tools/tools.gyp +++ b/webrtc/tools/tools.gyp @@ -137,7 +137,7 @@ 'conditions': [ # TODO(henrike): remove build_with_chromium==1 when the bots are # using Chromium's buildbots. - ['build_with_chromium==1 and OS=="android" and gtest_target_type=="shared_library"', { + ['build_with_chromium==1 and OS=="android"', { 'dependencies': [ '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code', ], @@ -148,7 +148,7 @@ # TODO(henrike): remove build_with_chromium==1 when the bots are using # Chromium's buildbots. 'conditions': [ - ['build_with_chromium==1 and OS=="android" and gtest_target_type=="shared_library"', { + ['build_with_chromium==1 and OS=="android"', { 'targets': [ { 'target_name': 'tools_unittests_apk_target', diff --git a/webrtc/video_engine/video_engine_core.gypi b/webrtc/video_engine/video_engine_core.gypi index dfb48b4e94..ce9d5365be 100644 --- a/webrtc/video_engine/video_engine_core.gypi +++ b/webrtc/video_engine/video_engine_core.gypi @@ -138,7 +138,7 @@ 'conditions': [ # TODO(henrike): remove build_with_chromium==1 when the bots are # using Chromium's buildbots. - ['build_with_chromium==1 and OS=="android" and gtest_target_type=="shared_library"', { + ['build_with_chromium==1 and OS=="android"', { 'dependencies': [ '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code', ], @@ -149,7 +149,7 @@ 'conditions': [ # TODO(henrike): remove build_with_chromium==1 when the bots are using # Chromium's buildbots. - ['build_with_chromium==1 and OS=="android" and gtest_target_type=="shared_library"', { + ['build_with_chromium==1 and OS=="android"', { 'targets': [ { 'target_name': 'video_engine_core_unittests_apk_target', diff --git a/webrtc/voice_engine/voice_engine.gyp b/webrtc/voice_engine/voice_engine.gyp index ded468fb59..19342c3a93 100644 --- a/webrtc/voice_engine/voice_engine.gyp +++ b/webrtc/voice_engine/voice_engine.gyp @@ -131,7 +131,7 @@ 'conditions': [ # TODO(henrike): remove build_with_chromium==1 when the bots are # using Chromium's buildbots. - ['build_with_chromium==1 and OS=="android" and gtest_target_type=="shared_library"', { + ['build_with_chromium==1 and OS=="android"', { 'dependencies': [ '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code', ], @@ -273,7 +273,7 @@ }], # TODO(henrike): remove build_with_chromium==1 when the bots are using # Chromium's buildbots. - ['build_with_chromium==1 and OS=="android" and gtest_target_type=="shared_library"', { + ['build_with_chromium==1 and OS=="android"', { 'targets': [ { 'target_name': 'voice_engine_unittests_apk_target', diff --git a/webrtc/webrtc_tests.gypi b/webrtc/webrtc_tests.gypi index 85bb088c58..72db2816fd 100644 --- a/webrtc/webrtc_tests.gypi +++ b/webrtc/webrtc_tests.gypi @@ -52,7 +52,7 @@ 'conditions': [ # TODO(henrike): remove build_with_chromium==1 when the bots are # using Chromium's buildbots. - ['build_with_chromium==1 and OS=="android" and gtest_target_type=="shared_library"', { + ['build_with_chromium==1 and OS=="android"', { 'dependencies': [ '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code', ], @@ -79,7 +79,7 @@ 'conditions': [ # TODO(henrike): remove build_with_chromium==1 when the bots are # using Chromium's buildbots. - ['build_with_chromium==1 and OS=="android" and gtest_target_type=="shared_library"', { + ['build_with_chromium==1 and OS=="android"', { 'dependencies': [ '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code', ], @@ -90,7 +90,7 @@ 'conditions': [ # TODO(henrike): remove build_with_chromium==1 when the bots are using # Chromium's buildbots. - ['build_with_chromium==1 and OS=="android" and gtest_target_type=="shared_library"', { + ['build_with_chromium==1 and OS=="android"', { 'targets': [ { 'target_name': 'video_engine_tests_apk_target',