diff options
| author | bulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-17 16:09:58 +0000 |
|---|---|---|
| committer | bulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-17 16:09:58 +0000 |
| commit | 87a80855771139a4140dd6686b7611290fb7937d (patch) | |
| tree | 258f3bb812d92677f5fceb6b5e67c0e3fbfd0fcf /third_party/leveldatabase | |
| parent | 93748d64955b60c0c75ababddb8be26823452cb7 (diff) | |
| download | chromium_src-87a80855771139a4140dd6686b7611290fb7937d.zip chromium_src-87a80855771139a4140dd6686b7611290fb7937d.tar.gz chromium_src-87a80855771139a4140dd6686b7611290fb7937d.tar.bz2 | |
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
Diffstat (limited to 'third_party/leveldatabase')
| -rw-r--r-- | third_party/leveldatabase/leveldatabase.gyp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/third_party/leveldatabase/leveldatabase.gyp b/third_party/leveldatabase/leveldatabase.gyp index 58504f3..3ba3829 100644 --- a/third_party/leveldatabase/leveldatabase.gyp +++ b/third_party/leveldatabase/leveldatabase.gyp @@ -14,8 +14,7 @@ 'use_snappy': 0, }, }], - ['OS=="android" and gtest_target_type == "shared_library"', { - # Wrap env_chromium_unittests into an android apk for execution. + ['OS=="android"', { 'targets': [{ 'target_name': 'env_chromium_unittests_apk', 'type': 'none', @@ -196,7 +195,7 @@ 'env_chromium_unittest.cc', ], 'conditions': [ - ['OS=="android" and gtest_target_type == "shared_library"', { + ['OS=="android"', { 'type': 'shared_library', 'dependencies': [ '../../testing/android/native_test.gyp:native_test_native_code', |