diff options
author | henrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-06-04 20:46:50 +0000 |
---|---|---|
committer | henrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-06-04 20:46:50 +0000 |
commit | 00d9c49cb076626f711988332749a0ebe8d2a32f (patch) | |
tree | bf4fccd0d1739721a7428962ed0afbcc36c4fc46 | |
parent | fc9463469d7e7fd6cda811f05a167544a8167181 (diff) | |
download | webrtc-00d9c49cb076626f711988332749a0ebe8d2a32f.tar.gz |
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/webrtc@6332 4adac7df-926f-26a2-2b94-8c16560cd09d
-rw-r--r-- | common_audio/common_audio.gyp | 4 | ||||
-rw-r--r-- | common_video/common_video_unittests.gyp | 4 | ||||
-rw-r--r-- | modules/audio_coding/codecs/tools/audio_codec_speed_tests.gypi | 4 | ||||
-rw-r--r-- | modules/audio_coding/neteq4/neteq.gypi | 4 | ||||
-rw-r--r-- | modules/modules.gyp | 6 | ||||
-rw-r--r-- | modules/video_capture/video_capture.gypi | 4 | ||||
-rw-r--r-- | system_wrappers/source/system_wrappers_tests.gyp | 4 | ||||
-rw-r--r-- | test/test.gyp | 6 | ||||
-rw-r--r-- | tools/tools.gyp | 4 | ||||
-rw-r--r-- | video_engine/video_engine_core.gypi | 4 | ||||
-rw-r--r-- | voice_engine/voice_engine.gyp | 4 | ||||
-rw-r--r-- | webrtc_tests.gypi | 6 |
12 files changed, 27 insertions, 27 deletions
diff --git a/common_audio/common_audio.gyp b/common_audio/common_audio.gyp index c3f141b4..3bed4e4d 100644 --- a/common_audio/common_audio.gyp +++ b/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/common_video/common_video_unittests.gyp b/common_video/common_video_unittests.gyp index 9523361c..91a11eda 100644 --- a/common_video/common_video_unittests.gyp +++ b/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/modules/audio_coding/codecs/tools/audio_codec_speed_tests.gypi b/modules/audio_coding/codecs/tools/audio_codec_speed_tests.gypi index 4d746e01..4d675e10 100644 --- a/modules/audio_coding/codecs/tools/audio_codec_speed_tests.gypi +++ b/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/modules/audio_coding/neteq4/neteq.gypi b/modules/audio_coding/neteq4/neteq.gypi index 84794c9e..280e5118 100644 --- a/modules/audio_coding/neteq4/neteq.gypi +++ b/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/modules/modules.gyp b/modules/modules.gyp index 10fa7ba6..701ee770 100644 --- a/modules/modules.gyp +++ b/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/modules/video_capture/video_capture.gypi b/modules/video_capture/video_capture.gypi index b13b27b3..dced22ce 100644 --- a/modules/video_capture/video_capture.gypi +++ b/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/system_wrappers/source/system_wrappers_tests.gyp b/system_wrappers/source/system_wrappers_tests.gyp index 59eef365..f2f61566 100644 --- a/system_wrappers/source/system_wrappers_tests.gyp +++ b/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/test/test.gyp b/test/test.gyp index feca0b28..69776e7b 100644 --- a/test/test.gyp +++ b/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/tools/tools.gyp b/tools/tools.gyp index 77238095..ee2a11d4 100644 --- a/tools/tools.gyp +++ b/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/video_engine/video_engine_core.gypi b/video_engine/video_engine_core.gypi index dfb48b4e..ce9d5365 100644 --- a/video_engine/video_engine_core.gypi +++ b/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/voice_engine/voice_engine.gyp b/voice_engine/voice_engine.gyp index ded468fb..19342c3a 100644 --- a/voice_engine/voice_engine.gyp +++ b/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_tests.gypi b/webrtc_tests.gypi index 85bb088c..72db2816 100644 --- a/webrtc_tests.gypi +++ b/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', |