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
Download Patch File Download Diff File Expand all files Collapse all files

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