Remove build_with_chromium==1 conditions for Android
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/webrtc@7019 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/modules/modules.gyp b/modules/modules.gyp
index 426ab08..b302bdb 100644
--- a/modules/modules.gyp
+++ b/modules/modules.gyp
@@ -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',
],
diff --git a/modules/video_capture/video_capture.gypi b/modules/video_capture/video_capture.gypi
index b32e30c..1a26eef 100644
--- a/modules/video_capture/video_capture.gypi
+++ b/modules/video_capture/video_capture.gypi
@@ -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',
],
diff --git a/test/test.gyp b/test/test.gyp
index 0514e37..ef57d5d 100644
--- a/test/test.gyp
+++ b/test/test.gyp
@@ -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',
],
diff --git a/webrtc_tests.gypi b/webrtc_tests.gypi
index c8c0679..ab71429 100644
--- a/webrtc_tests.gypi
+++ b/webrtc_tests.gypi
@@ -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',
],
