diff options
| author | henrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-06-04 20:46:50 +0000 |
|---|---|---|
| committer | henrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-06-04 20:46:50 +0000 |
| commit | 00d9c49cb076626f711988332749a0ebe8d2a32f (patch) | |
| tree | bf4fccd0d1739721a7428962ed0afbcc36c4fc46 /common_audio/common_audio.gyp | |
| parent | fc9463469d7e7fd6cda811f05a167544a8167181 (diff) | |
| download | webrtc-00d9c49cb076626f711988332749a0ebe8d2a32f.tar.gz | |
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
Diffstat (limited to 'common_audio/common_audio.gyp')
| -rw-r--r-- | common_audio/common_audio.gyp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common_audio/common_audio.gyp b/common_audio/common_audio.gyp index c3f141b4..3bed4e4d 100644 --- a/common_audio/common_audio.gyp +++ b/common_audio/common_audio.gyp @@ -215,7 +215,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', ], @@ -226,7 +226,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"', { 'targets': [ { 'target_name': 'common_audio_unittests_apk_target', |