admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove build_with_chromium==1 conditions for Android

Browse Source 
Most of these changes were done in r7014, but a few targets
were missed. This should make these tests run better
(but they might still be failing due to webrtc:3764).

BUG=webrtc:3741
TESTED=Local compilation using:
GYP_DEFINES="OS=android component=static_library fastbuild=1 target_arch=arm" webrtc/build/gyp_webrtc
ninja -C out/Debug

R=phoglund@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/24369004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7019 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
kjellander@webrtc.org 2014-09-02 08:40:39 +00:00
parent 841f58f64c
commit 76a42577ad
4 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
webrtc/modules/modules.gyp
View File

@ -295,9 +295,7 @@
'<(DEPTH)/third_party/libvpx/libvpx.gyp:libvpx',
],
}],
# TODO(henrike): remove build_with_chromium==1 when the bots are
# using Chromium's buildbots.
['build_with_chromium==1 and OS=="android"', {
['OS=="android"', {
'dependencies': [
'<(DEPTH)/testing/android/native_test.gyp:native_test_native_code',
],

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

@ -203,9 +203,7 @@
'-lX11',
],
}],
# TODO(henrike): remove build_with_chromium==1 when the bots are
# using Chromium's buildbots.
['build_with_chromium==1 and OS=="android"', {
['OS=="android"', {
'dependencies': [
'<(DEPTH)/testing/android/native_test.gyp:native_test_native_code',
],

4
webrtc/test/test.gyp
View File

@ -115,9 +115,7 @@
'testsupport/trace_to_stderr.h',
],
'conditions': [
# TODO(henrike): remove build_with_chromium==1 when the bots are using
# Chromium's buildbots.
['build_with_chromium==1 and OS=="android"', {
['OS=="android"', {
'dependencies': [
'<(DEPTH)/base/base.gyp:base',
],

4
webrtc/webrtc_tests.gypi
View File

@ -88,9 +88,7 @@
'webrtc',
],
'conditions': [
# TODO(henrike): remove build_with_chromium==1 when the bots are
# using Chromium's buildbots.
['build_with_chromium==1 and OS=="android"', {
['OS=="android"', {
'dependencies': [
'<(DEPTH)/testing/android/native_test.gyp:native_test_native_code',
],