Android: cleanup gtest_target_type conditions.
For a long time (crrev.com/133053) OS==android implies:
gtest_target_type=shared_library
Cleanup the spurious conditions and obsolete TODOs.
BUG=
Review URL: https://codereview.chromium.org/278443003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271222 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/net/net.gyp b/net/net.gyp
index 9a0c223..5b5db96 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -799,7 +799,7 @@
],
},
],
- ['OS == "android" and gtest_target_type == "shared_library"', {
+ ['OS == "android"', {
# TODO(mmenke): This depends on test_support_base, which depends on
# icu. Figure out a way to remove that dependency.
'dependencies': [
@@ -1627,10 +1627,7 @@
},
],
}],
- # Special target to wrap a gtest_target_type==shared_library
- # net_unittests into an android apk for execution.
- # See base.gyp for TODO(jrg)s about this strategy.
- ['OS == "android" and gtest_target_type == "shared_library"', {
+ ['OS == "android"', {
'targets': [
{
'target_name': 'net_unittests_apk',
