| OLD | NEW |
| 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 { | 5 { |
| 6 'targets': [ | 6 'targets': [ |
| 7 { | 7 { |
| 8 'target_name': 'test_support_content', | 8 'target_name': 'test_support_content', |
| 9 'type': 'static_library', | 9 'type': 'static_library', |
| 10 'defines!': ['CONTENT_IMPLEMENTATION'], | 10 'defines!': ['CONTENT_IMPLEMENTATION'], |
| (...skipping 714 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 725 ['OS == "android" and gtest_target_type == "shared_library"', { | 725 ['OS == "android" and gtest_target_type == "shared_library"', { |
| 726 'dependencies': [ | 726 'dependencies': [ |
| 727 '../testing/android/native_test.gyp:native_test_native_code', | 727 '../testing/android/native_test.gyp:native_test_native_code', |
| 728 ], | 728 ], |
| 729 }], | 729 }], |
| 730 ['enable_webrtc==1 and google_tv==1', { | 730 ['enable_webrtc==1 and google_tv==1', { |
| 731 'sources': [ | 731 'sources': [ |
| 732 'renderer/media/rtc_video_decoder_factory_tv_unittest.cc', | 732 'renderer/media/rtc_video_decoder_factory_tv_unittest.cc', |
| 733 ], | 733 ], |
| 734 }], | 734 }], |
| 735 # TODO(bryaneyler): Also enable these for OpenSSL once that |
| 736 # implementation is ready. |
| 737 ['use_nss==1', { |
| 738 'sources': [ |
| 739 'renderer/webcrypto_sha_digest_unittest.cc', |
| 740 ], |
| 741 }], |
| 735 ], | 742 ], |
| 736 }, | 743 }, |
| 737 ], | 744 ], |
| 738 'conditions': [ | 745 'conditions': [ |
| 739 ['OS!="ios"', { | 746 ['OS!="ios"', { |
| 740 'targets': [ | 747 'targets': [ |
| 741 { | 748 { |
| 742 'target_name': 'content_browsertests', | 749 'target_name': 'content_browsertests', |
| 743 'type': '<(gtest_target_type)', | 750 'type': '<(gtest_target_type)', |
| 744 'defines!': ['CONTENT_IMPLEMENTATION'], | 751 'defines!': ['CONTENT_IMPLEMENTATION'], |
| (...skipping 501 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1246 'resource_dir': 'shell/android/shell_apk/res', | 1253 'resource_dir': 'shell/android/shell_apk/res', |
| 1247 'additional_src_dirs': ['public/android/javatests/',], | 1254 'additional_src_dirs': ['public/android/javatests/',], |
| 1248 'is_test_apk': 1, | 1255 'is_test_apk': 1, |
| 1249 }, | 1256 }, |
| 1250 'includes': [ '../build/java_apk.gypi' ], | 1257 'includes': [ '../build/java_apk.gypi' ], |
| 1251 }, | 1258 }, |
| 1252 ], | 1259 ], |
| 1253 }], | 1260 }], |
| 1254 ], | 1261 ], |
| 1255 } | 1262 } |
| OLD | NEW |