generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Android: cleanup gtest_target_type conditions.

Browse Source 
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
This commit is contained in:
henrike@webrtc.org 2014-06-04 20:46:50 +00:00
parent 738df8913d
commit e6e139159f
12 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
webrtc/common_audio/common_audio.gyp
View File

@ -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',

4
webrtc/common_video/common_video_unittests.gyp
View File

@ -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',

4
webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_tests.gypi
View File

@ -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',

4
webrtc/modules/audio_coding/neteq4/neteq.gypi
View File

@ -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',

6
webrtc/modules/modules.gyp
View File

@ -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',

4
webrtc/modules/video_capture/video_capture.gypi
View File

@ -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',
],

4
webrtc/system_wrappers/source/system_wrappers_tests.gyp
View File

@ -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',

6
webrtc/test/test.gyp
View File

@ -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',

4
webrtc/tools/tools.gyp
View File

@ -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',

4
webrtc/video_engine/video_engine_core.gypi
View File

@ -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',

4
webrtc/voice_engine/voice_engine.gyp
View File

@ -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',

6
webrtc/webrtc_tests.gypi
View File

@ -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',