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 /webrtc_tests.gypi | |
| 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 'webrtc_tests.gypi')
| -rw-r--r-- | webrtc_tests.gypi | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/webrtc_tests.gypi b/webrtc_tests.gypi index 85bb088c..72db2816 100644 --- a/webrtc_tests.gypi +++ b/webrtc_tests.gypi @@ -52,7 +52,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', ], @@ -79,7 +79,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', ], @@ -90,7 +90,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': 'video_engine_tests_apk_target', |