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 /sandbox | |
| 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 'sandbox')
| -rw-r--r-- | sandbox/linux/sandbox_linux.gypi | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sandbox/linux/sandbox_linux.gypi b/sandbox/linux/sandbox_linux.gypi index 0fdb6ba..16fd2c2 100644 --- a/sandbox/linux/sandbox_linux.gypi +++ b/sandbox/linux/sandbox_linux.gypi @@ -105,7 +105,7 @@ ], 'type': 'shared_library', 'conditions': [ - [ 'OS == "android" and gtest_target_type == "shared_library"', { + [ 'OS == "android"', { 'dependencies': [ '../testing/android/native_test.gyp:native_test_native_code', ], @@ -319,8 +319,7 @@ } ], }], - # Strategy copied from base_unittests_apk in base/base.gyp. - [ 'OS=="android" and gtest_target_type == "shared_library"', { + [ 'OS=="android"', { 'targets': [ { 'target_name': 'sandbox_linux_jni_unittests_apk', |