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
diff --git a/tools/tools.gyp b/tools/tools.gyp
index 7723809..ee2a11d 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',