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 717 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 728 }], | 728 }], |
| 729 ['enable_webrtc==1 and google_tv==1', { | 729 ['enable_webrtc==1 and google_tv==1', { |
| 730 'sources': [ | 730 'sources': [ |
| 731 'renderer/media/rtc_video_decoder_factory_tv_unittest.cc', | 731 'renderer/media/rtc_video_decoder_factory_tv_unittest.cc', |
| 732 ], | 732 ], |
| 733 }], | 733 }], |
| 734 ], | 734 ], |
| 735 }, | 735 }, |
| 736 ], | 736 ], |
| 737 'conditions': [ | 737 'conditions': [ |
| 738 ['OS == "android" and gtest_target_type == "shared_library"', { | |
| 739 'targets': [ | |
|
cjhopman
2013/08/30 18:24:28
Move this target down by the other *_apk targets
no sievers
2013/09/03 20:10:59
Done.
| |
| 740 { | |
| 741 'target_name': 'content_gl_tests_apk', | |
| 742 'type': 'none', | |
| 743 'dependencies': [ | |
| 744 'content_gl_tests', | |
| 745 'content_java_test_support', | |
| 746 ], | |
| 747 'variables': { | |
| 748 'test_suite_name': 'content_gl_tests', | |
| 749 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)content_g l_tests<(SHARED_LIB_SUFFIX)', | |
| 750 }, | |
| 751 'includes': [ | |
| 752 '../build/apk_test.gypi', | |
| 753 ], | |
| 754 }, | |
| 755 ], | |
| 756 }], | |
| 738 ['OS!="ios"', { | 757 ['OS!="ios"', { |
| 739 'targets': [ | 758 'targets': [ |
| 740 { | 759 { |
| 741 'target_name': 'content_browsertests', | 760 'target_name': 'content_browsertests', |
| 742 'type': '<(gtest_target_type)', | 761 'type': '<(gtest_target_type)', |
| 743 'defines!': ['CONTENT_IMPLEMENTATION'], | 762 'defines!': ['CONTENT_IMPLEMENTATION'], |
| 744 'dependencies': [ | 763 'dependencies': [ |
| 745 'content_common', | 764 'content_common', |
| 746 'content_gpu', | 765 'content_gpu', |
| 747 'content_plugin', | 766 'content_plugin', |
| (...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1008 '../webkit/support/webkit_support.gyp:glue', | 1027 '../webkit/support/webkit_support.gyp:glue', |
| 1009 '../webkit/support/webkit_support.gyp:glue_child', | 1028 '../webkit/support/webkit_support.gyp:glue_child', |
| 1010 ], | 1029 ], |
| 1011 'include_dirs': [ | 1030 'include_dirs': [ |
| 1012 '..', | 1031 '..', |
| 1013 ], | 1032 ], |
| 1014 'sources': [ | 1033 'sources': [ |
| 1015 'common/gpu/client/gl_helper_unittests.cc', | 1034 'common/gpu/client/gl_helper_unittests.cc', |
| 1016 'common/gpu/client/gpu_in_process_context_tests.cc', | 1035 'common/gpu/client/gpu_in_process_context_tests.cc', |
| 1017 ], | 1036 ], |
| 1037 'conditions': [ | |
| 1038 ['OS=="android"', { | |
| 1039 'dependencies': [ | |
| 1040 '../testing/android/native_test.gyp:native_test_native_code', | |
| 1041 ], | |
| 1042 }], | |
| 1043 ], | |
| 1018 }, | 1044 }, |
| 1019 { | 1045 { |
| 1020 'target_name': 'content_gl_benchmark', | 1046 'target_name': 'content_gl_benchmark', |
| 1021 'type': '<(gtest_target_type)', | 1047 'type': '<(gtest_target_type)', |
| 1022 'defines!': ['CONTENT_IMPLEMENTATION'], | 1048 'defines!': ['CONTENT_IMPLEMENTATION'], |
| 1023 'dependencies': [ | 1049 'dependencies': [ |
| 1024 'content_common', | 1050 'content_common', |
| 1025 'test_support_content', | 1051 'test_support_content', |
| 1026 '../base/base.gyp:test_support_base', | 1052 '../base/base.gyp:test_support_base', |
| 1027 '../testing/gtest.gyp:gtest', | 1053 '../testing/gtest.gyp:gtest', |
| (...skipping 364 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1392 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'], | 1418 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'], |
| 1393 }, | 1419 }, |
| 1394 ], | 1420 ], |
| 1395 }], | 1421 }], |
| 1396 ], | 1422 ], |
| 1397 }, | 1423 }, |
| 1398 ], | 1424 ], |
| 1399 }], | 1425 }], |
| 1400 ], | 1426 ], |
| 1401 } | 1427 } |
| OLD | NEW |