Chromium Code Reviews| 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 759 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 770 ['OS == "android" and gtest_target_type == "shared_library"', { | 770 ['OS == "android" and gtest_target_type == "shared_library"', { |
| 771 'dependencies': [ | 771 'dependencies': [ |
| 772 '../testing/android/native_test.gyp:native_test_native_code', | 772 '../testing/android/native_test.gyp:native_test_native_code', |
| 773 ], | 773 ], |
| 774 }], | 774 }], |
| 775 ['enable_webrtc==1 and google_tv==1', { | 775 ['enable_webrtc==1 and google_tv==1', { |
| 776 'sources': [ | 776 'sources': [ |
| 777 'renderer/media/rtc_video_decoder_factory_tv_unittest.cc', | 777 'renderer/media/rtc_video_decoder_factory_tv_unittest.cc', |
| 778 ], | 778 ], |
| 779 }], | 779 }], |
| 780 # TODO(bryaneyler): Also enable these for OpenSSL once that | |
| 781 # implementation is ready. Issue 267888. | |
| 782 ['use_nss!=1', { | |
| 783 'sources!': [ | |
| 784 'renderer/webcrypto_impl_unittest.cc', | |
|
Bryan Eyler
2013/09/23 21:45:51
Removal of this check is correct, but my guess is
padolph
2013/09/23 22:08:31
The workflow to do what you suggest is not clear t
padolph
2013/09/24 02:08:32
Done.
| |
| 785 ], | |
| 786 }], | |
| 787 ], | 780 ], |
| 788 }, | 781 }, |
| 789 ], | 782 ], |
| 790 'conditions': [ | 783 'conditions': [ |
| 791 ['OS!="ios"', { | 784 ['OS!="ios"', { |
| 792 'targets': [ | 785 'targets': [ |
| 793 { | 786 { |
| 794 'target_name': 'content_browsertests', | 787 'target_name': 'content_browsertests', |
| 795 'type': '<(gtest_target_type)', | 788 'type': '<(gtest_target_type)', |
| 796 'defines!': ['CONTENT_IMPLEMENTATION'], | 789 'defines!': ['CONTENT_IMPLEMENTATION'], |
| (...skipping 695 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1492 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'], | 1485 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'], |
| 1493 }, | 1486 }, |
| 1494 ], | 1487 ], |
| 1495 }], | 1488 }], |
| 1496 ], | 1489 ], |
| 1497 }, | 1490 }, |
| 1498 ], | 1491 ], |
| 1499 }], | 1492 }], |
| 1500 ], | 1493 ], |
| 1501 } | 1494 } |
| OLD | NEW |