| 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'], |
| 11 'dependencies': [ | 11 'dependencies': [ |
| 12 '../media/media.gyp:media', | 12 '../media/media.gyp:media', |
| 13 '../net/net.gyp:net_test_support', | 13 '../net/net.gyp:net_test_support', |
| 14 '../skia/skia.gyp:skia', | 14 '../skia/skia.gyp:skia', |
| 15 '../testing/gmock.gyp:gmock', | 15 '../testing/gmock.gyp:gmock', |
| 16 '../testing/gtest.gyp:gtest', | 16 '../testing/gtest.gyp:gtest', |
| 17 '../ui/ui.gyp:ui_test_support', | 17 '../ui/ui.gyp:ui_test_support', |
| 18 '../url/url.gyp:url_lib', | 18 '../url/url.gyp:url_lib', |
| 19 'content_app', | 19 'content.gyp:content_app', |
| 20 'content_browser', | 20 'content.gyp:content_browser', |
| 21 'content_common', | 21 'content.gyp:content_common', |
| 22 ], | 22 ], |
| 23 'include_dirs': [ | 23 'include_dirs': [ |
| 24 '..', | 24 '..', |
| 25 ], | 25 ], |
| 26 'sources': [ | 26 'sources': [ |
| 27 'public/test/browser_test_base.cc', | 27 'public/test/browser_test_base.cc', |
| 28 'public/test/browser_test_base.h', | 28 'public/test/browser_test_base.h', |
| 29 'public/test/browser_test.h', | 29 'public/test/browser_test.h', |
| 30 'public/test/browser_test_utils.cc', | 30 'public/test/browser_test_utils.cc', |
| 31 'public/test/browser_test_utils.h', | 31 'public/test/browser_test_utils.h', |
| (...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 154 ['include', '^public/test/test_content_client_initializer\\.cc$'], | 154 ['include', '^public/test/test_content_client_initializer\\.cc$'], |
| 155 ['include', '^public/test/test_notification_tracker\\.cc$'], | 155 ['include', '^public/test/test_notification_tracker\\.cc$'], |
| 156 ['include', '^public/test/test_utils\\.cc$'], | 156 ['include', '^public/test/test_utils\\.cc$'], |
| 157 ['include', '^public/test/unittest_test_suite\\.cc$'], | 157 ['include', '^public/test/unittest_test_suite\\.cc$'], |
| 158 ['include', '^test/content_test_suite\\.cc$'], | 158 ['include', '^test/content_test_suite\\.cc$'], |
| 159 ['include', '^test/test_content_browser_client\\.cc$'], | 159 ['include', '^test/test_content_browser_client\\.cc$'], |
| 160 ['include', '^test/test_content_client\\.cc$'], | 160 ['include', '^test/test_content_client\\.cc$'], |
| 161 ], | 161 ], |
| 162 }, { # OS != "ios" | 162 }, { # OS != "ios" |
| 163 'dependencies': [ | 163 'dependencies': [ |
| 164 'content_child', | 164 'content.gyp:content_child', |
| 165 'content_ppapi_plugin', | 165 'content.gyp:content_ppapi_plugin', |
| 166 'content_utility', | 166 'content.gyp:content_utility', |
| 167 'content_worker', | 167 'content.gyp:content_worker', |
| 168 '../ppapi/ppapi_internal.gyp:ppapi_host', | 168 '../ppapi/ppapi_internal.gyp:ppapi_host', |
| 169 '../ppapi/ppapi_internal.gyp:ppapi_proxy', | 169 '../ppapi/ppapi_internal.gyp:ppapi_proxy', |
| 170 '../ppapi/ppapi_internal.gyp:ppapi_shared', | 170 '../ppapi/ppapi_internal.gyp:ppapi_shared', |
| 171 '../ppapi/ppapi_internal.gyp:ppapi_unittest_shared', | 171 '../ppapi/ppapi_internal.gyp:ppapi_unittest_shared', |
| 172 '../third_party/WebKit/public/blink.gyp:blink', | 172 '../third_party/WebKit/public/blink.gyp:blink', |
| 173 '../third_party/WebKit/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpR
enderTree.gyp:TestRunner', | 173 '../third_party/WebKit/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpR
enderTree.gyp:TestRunner', |
| 174 '../ui/surface/surface.gyp:surface', | 174 '../ui/surface/surface.gyp:surface', |
| 175 '../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu', | 175 '../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu', |
| 176 '../webkit/renderer/compositor_bindings/compositor_bindings.gyp:webk
it_compositor_support', | 176 '../webkit/renderer/compositor_bindings/compositor_bindings.gyp:webk
it_compositor_support', |
| 177 '../webkit/support/webkit_support.gyp:webkit_support_common', | 177 '../webkit/support/webkit_support.gyp:webkit_support_common', |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 238 'test_support_content_jni_headers', | 238 'test_support_content_jni_headers', |
| 239 ], | 239 ], |
| 240 }], | 240 }], |
| 241 ], | 241 ], |
| 242 }, | 242 }, |
| 243 { | 243 { |
| 244 'target_name': 'content_unittests', | 244 'target_name': 'content_unittests', |
| 245 'type': '<(gtest_target_type)', | 245 'type': '<(gtest_target_type)', |
| 246 'defines!': ['CONTENT_IMPLEMENTATION'], | 246 'defines!': ['CONTENT_IMPLEMENTATION'], |
| 247 'dependencies': [ | 247 'dependencies': [ |
| 248 'content_browser', | 248 'content.gyp:content_browser', |
| 249 'content_common', | 249 'content.gyp:content_common', |
| 250 'test_support_content', | 250 'test_support_content', |
| 251 'browser/speech/proto/speech_proto.gyp:speech_proto', | 251 'browser/speech/proto/speech_proto.gyp:speech_proto', |
| 252 '../base/base.gyp:test_support_base', | 252 '../base/base.gyp:test_support_base', |
| 253 '../crypto/crypto.gyp:crypto', | 253 '../crypto/crypto.gyp:crypto', |
| 254 '../media/media.gyp:media_test_support', | 254 '../media/media.gyp:media_test_support', |
| 255 '../net/net.gyp:net_test_support', | 255 '../net/net.gyp:net_test_support', |
| 256 '../skia/skia.gyp:skia', | 256 '../skia/skia.gyp:skia', |
| 257 '../sql/sql.gyp:sql', | 257 '../sql/sql.gyp:sql', |
| 258 '../testing/gmock.gyp:gmock', | 258 '../testing/gmock.gyp:gmock', |
| 259 '../testing/gtest.gyp:gtest', | 259 '../testing/gtest.gyp:gtest', |
| (...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 553 # iOS only needs a small portion of content; exclude all the | 553 # iOS only needs a small portion of content; exclude all the |
| 554 # implementation, and re-include what is used. | 554 # implementation, and re-include what is used. |
| 555 ['exclude', '\\.(cc|mm)$'], | 555 ['exclude', '\\.(cc|mm)$'], |
| 556 ['include', '_ios\\.(cc|mm)$'], | 556 ['include', '_ios\\.(cc|mm)$'], |
| 557 ['include', '^browser/notification_service_impl_unittest\\.cc$'], | 557 ['include', '^browser/notification_service_impl_unittest\\.cc$'], |
| 558 ['include', '^browser/web_contents/navigation_entry_impl_unittest\\.
cc$'], | 558 ['include', '^browser/web_contents/navigation_entry_impl_unittest\\.
cc$'], |
| 559 ['include', '^test/run_all_unittests\\.cc$'], | 559 ['include', '^test/run_all_unittests\\.cc$'], |
| 560 ], | 560 ], |
| 561 }, { # OS != "ios" | 561 }, { # OS != "ios" |
| 562 'dependencies': [ | 562 'dependencies': [ |
| 563 'content_browser', | 563 'content.gyp:content_browser', |
| 564 'content_child', | 564 'content.gyp:content_child', |
| 565 'content_gpu', | 565 'content.gyp:content_gpu', |
| 566 'content_plugin', | 566 'content.gyp:content_plugin', |
| 567 'content_renderer', | 567 'content.gyp:content_renderer', |
| 568 'content_resources.gyp:content_resources', | 568 'content_resources.gyp:content_resources', |
| 569 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn
amic_annotations', | 569 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn
amic_annotations', |
| 570 '../gpu/gpu.gyp:gpu', | 570 '../gpu/gpu.gyp:gpu', |
| 571 '../gpu/gpu.gyp:gpu_unittest_utils', | 571 '../gpu/gpu.gyp:gpu_unittest_utils', |
| 572 '../ipc/ipc.gyp:test_support_ipc', | 572 '../ipc/ipc.gyp:test_support_ipc', |
| 573 '../jingle/jingle.gyp:jingle_glue_test_util', | 573 '../jingle/jingle.gyp:jingle_glue_test_util', |
| 574 '../media/media.gyp:shared_memory_support', | 574 '../media/media.gyp:shared_memory_support', |
| 575 '../third_party/WebKit/public/blink.gyp:blink', | 575 '../third_party/WebKit/public/blink.gyp:blink', |
| 576 '../third_party/icu/icu.gyp:icui18n', | 576 '../third_party/icu/icu.gyp:icui18n', |
| 577 '../third_party/icu/icu.gyp:icuuc', | 577 '../third_party/icu/icu.gyp:icuuc', |
| (...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 728 }, | 728 }, |
| 729 ], | 729 ], |
| 730 'conditions': [ | 730 'conditions': [ |
| 731 ['OS!="ios"', { | 731 ['OS!="ios"', { |
| 732 'targets': [ | 732 'targets': [ |
| 733 { | 733 { |
| 734 'target_name': 'content_browsertests', | 734 'target_name': 'content_browsertests', |
| 735 'type': '<(gtest_target_type)', | 735 'type': '<(gtest_target_type)', |
| 736 'defines!': ['CONTENT_IMPLEMENTATION'], | 736 'defines!': ['CONTENT_IMPLEMENTATION'], |
| 737 'dependencies': [ | 737 'dependencies': [ |
| 738 'content_common', | 738 'content.gyp:content_common', |
| 739 'content_gpu', | 739 'content.gyp:content_gpu', |
| 740 'content_plugin', | 740 'content.gyp:content_plugin', |
| 741 'content_renderer', | 741 'content.gyp:content_renderer', |
| 742 'content_shell_lib', | 742 'content_shell_lib', |
| 743 'content_shell_pak', | 743 'content_shell_pak', |
| 744 'test_support_content', | 744 'test_support_content', |
| 745 '../base/base.gyp:test_support_base', | 745 '../base/base.gyp:test_support_base', |
| 746 '../gpu/gpu.gyp:gpu', | 746 '../gpu/gpu.gyp:gpu', |
| 747 '../ipc/ipc.gyp:test_support_ipc', | 747 '../ipc/ipc.gyp:test_support_ipc', |
| 748 '../net/net.gyp:net_test_support', | 748 '../net/net.gyp:net_test_support', |
| 749 '../ppapi/ppapi_internal.gyp:ppapi_host', | 749 '../ppapi/ppapi_internal.gyp:ppapi_host', |
| 750 '../ppapi/ppapi_internal.gyp:ppapi_ipc', | 750 '../ppapi/ppapi_internal.gyp:ppapi_ipc', |
| 751 '../ppapi/ppapi_internal.gyp:ppapi_proxy', | 751 '../ppapi/ppapi_internal.gyp:ppapi_proxy', |
| (...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 979 ['exclude', '^browser/speech/'], | 979 ['exclude', '^browser/speech/'], |
| 980 ] | 980 ] |
| 981 }], | 981 }], |
| 982 ], | 982 ], |
| 983 }, | 983 }, |
| 984 { | 984 { |
| 985 'target_name': 'content_gl_tests', | 985 'target_name': 'content_gl_tests', |
| 986 'type': '<(gtest_target_type)', | 986 'type': '<(gtest_target_type)', |
| 987 'defines!': ['CONTENT_IMPLEMENTATION'], | 987 'defines!': ['CONTENT_IMPLEMENTATION'], |
| 988 'dependencies': [ | 988 'dependencies': [ |
| 989 'content_common', | 989 'content.gyp:content_common', |
| 990 'test_support_content', | 990 'test_support_content', |
| 991 '../base/base.gyp:test_support_base', | 991 '../base/base.gyp:test_support_base', |
| 992 '../testing/gtest.gyp:gtest', | 992 '../testing/gtest.gyp:gtest', |
| 993 '../ui/ui.gyp:ui', | 993 '../ui/ui.gyp:ui', |
| 994 '../ui/gl/gl.gyp:gl', | 994 '../ui/gl/gl.gyp:gl', |
| 995 '../third_party/WebKit/public/blink.gyp:blink', | 995 '../third_party/WebKit/public/blink.gyp:blink', |
| 996 ], | 996 ], |
| 997 'include_dirs': [ | 997 'include_dirs': [ |
| 998 '..', | 998 '..', |
| 999 ], | 999 ], |
| 1000 'sources': [ | 1000 'sources': [ |
| 1001 'common/gpu/client/gl_helper_unittests.cc', | 1001 'common/gpu/client/gl_helper_unittests.cc', |
| 1002 ], | 1002 ], |
| 1003 }, | 1003 }, |
| 1004 { | 1004 { |
| 1005 'target_name': 'content_gl_benchmark', | 1005 'target_name': 'content_gl_benchmark', |
| 1006 'type': '<(gtest_target_type)', | 1006 'type': '<(gtest_target_type)', |
| 1007 'defines!': ['CONTENT_IMPLEMENTATION'], | 1007 'defines!': ['CONTENT_IMPLEMENTATION'], |
| 1008 'dependencies': [ | 1008 'dependencies': [ |
| 1009 'content_common', | 1009 'content.gyp:content_common', |
| 1010 'test_support_content', | 1010 'test_support_content', |
| 1011 '../base/base.gyp:test_support_base', | 1011 '../base/base.gyp:test_support_base', |
| 1012 '../testing/gtest.gyp:gtest', | 1012 '../testing/gtest.gyp:gtest', |
| 1013 '../ui/ui.gyp:ui', | 1013 '../ui/ui.gyp:ui', |
| 1014 '../ui/gl/gl.gyp:gl', | 1014 '../ui/gl/gl.gyp:gl', |
| 1015 '../third_party/WebKit/public/blink.gyp:blink', | 1015 '../third_party/WebKit/public/blink.gyp:blink', |
| 1016 ], | 1016 ], |
| 1017 'include_dirs': [ | 1017 'include_dirs': [ |
| 1018 '..', | 1018 '..', |
| 1019 ], | 1019 ], |
| 1020 'sources': [ | 1020 'sources': [ |
| 1021 'common/gpu/client/gl_helper_benchmark.cc', | 1021 'common/gpu/client/gl_helper_benchmark.cc', |
| 1022 ], | 1022 ], |
| 1023 }, | 1023 }, |
| 1024 ], | 1024 ], |
| 1025 }], | 1025 }], |
| 1026 ['chromeos==1 or OS=="win" or OS=="android"', { | 1026 ['chromeos==1 or OS=="win" or OS=="android"', { |
| 1027 'targets': [ | 1027 'targets': [ |
| 1028 { | 1028 { |
| 1029 'target_name': 'video_decode_accelerator_unittest', | 1029 'target_name': 'video_decode_accelerator_unittest', |
| 1030 'type': '<(gtest_target_type)', | 1030 'type': '<(gtest_target_type)', |
| 1031 'dependencies': [ | 1031 'dependencies': [ |
| 1032 'content', | 1032 'content.gyp:content', |
| 1033 '../base/base.gyp:base', | 1033 '../base/base.gyp:base', |
| 1034 '../testing/gtest.gyp:gtest', | 1034 '../testing/gtest.gyp:gtest', |
| 1035 '../media/media.gyp:media', | 1035 '../media/media.gyp:media', |
| 1036 '../ui/gl/gl.gyp:gl', | 1036 '../ui/gl/gl.gyp:gl', |
| 1037 '../ui/ui.gyp:ui', | 1037 '../ui/ui.gyp:ui', |
| 1038 ], | 1038 ], |
| 1039 'include_dirs': [ | 1039 'include_dirs': [ |
| 1040 '<(DEPTH)/third_party/khronos', | 1040 '<(DEPTH)/third_party/khronos', |
| 1041 ], | 1041 ], |
| 1042 'sources': [ | 1042 'sources': [ |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1091 'msvs_disabled_warnings': [ 4267, ], | 1091 'msvs_disabled_warnings': [ 4267, ], |
| 1092 }, | 1092 }, |
| 1093 ] | 1093 ] |
| 1094 }], | 1094 }], |
| 1095 ['chromeos == 1 or OS == "linux"', { | 1095 ['chromeos == 1 or OS == "linux"', { |
| 1096 'targets': [ | 1096 'targets': [ |
| 1097 { | 1097 { |
| 1098 'target_name': 'h264_parser_unittest', | 1098 'target_name': 'h264_parser_unittest', |
| 1099 'type': 'executable', | 1099 'type': 'executable', |
| 1100 'dependencies': [ | 1100 'dependencies': [ |
| 1101 'content_common', | 1101 'content.gyp:content_common', |
| 1102 '../base/base.gyp:base', | 1102 '../base/base.gyp:base', |
| 1103 '../testing/gtest.gyp:gtest', | 1103 '../testing/gtest.gyp:gtest', |
| 1104 ], | 1104 ], |
| 1105 'sources': [ | 1105 'sources': [ |
| 1106 'common/gpu/media/h264_bit_reader_unittest.cc', | 1106 'common/gpu/media/h264_bit_reader_unittest.cc', |
| 1107 'common/gpu/media/h264_parser_unittest.cc', | 1107 'common/gpu/media/h264_parser_unittest.cc', |
| 1108 ], | 1108 ], |
| 1109 'conditions': [ | 1109 'conditions': [ |
| 1110 ['linux_use_tcmalloc==1', { | 1110 ['linux_use_tcmalloc==1', { |
| 1111 'dependencies': [ | 1111 'dependencies': [ |
| 1112 '../base/allocator/allocator.gyp:allocator', | 1112 '../base/allocator/allocator.gyp:allocator', |
| 1113 ], | 1113 ], |
| 1114 }], | 1114 }], |
| 1115 ], | 1115 ], |
| 1116 } | 1116 } |
| 1117 ], | 1117 ], |
| 1118 }], | 1118 }], |
| 1119 # Special target to wrap a gtest_target_type==shared_library | 1119 # Special target to wrap a gtest_target_type==shared_library |
| 1120 # content_unittests into an android apk for execution. | 1120 # content_unittests into an android apk for execution. |
| 1121 # See base.gyp for TODO(jrg)s about this strategy. | 1121 # See base.gyp for TODO(jrg)s about this strategy. |
| 1122 ['OS == "android" and gtest_target_type == "shared_library"', { | 1122 ['OS == "android" and gtest_target_type == "shared_library"', { |
| 1123 'targets': [ | 1123 'targets': [ |
| 1124 { | 1124 { |
| 1125 'target_name': 'content_unittests_apk', | 1125 'target_name': 'content_unittests_apk', |
| 1126 'type': 'none', | 1126 'type': 'none', |
| 1127 'dependencies': [ | 1127 'dependencies': [ |
| 1128 'content_java', | 1128 'content.gyp:content_java', |
| 1129 'content_unittests', | 1129 'content_unittests', |
| 1130 ], | 1130 ], |
| 1131 'variables': { | 1131 'variables': { |
| 1132 'test_suite_name': 'content_unittests', | 1132 'test_suite_name': 'content_unittests', |
| 1133 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)content_u
nittests<(SHARED_LIB_SUFFIX)', | 1133 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)content_u
nittests<(SHARED_LIB_SUFFIX)', |
| 1134 }, | 1134 }, |
| 1135 'includes': [ '../build/apk_test.gypi' ], | 1135 'includes': [ '../build/apk_test.gypi' ], |
| 1136 }, | 1136 }, |
| 1137 { | 1137 { |
| 1138 'target_name': 'content_browsertests_apk', | 1138 'target_name': 'content_browsertests_apk', |
| 1139 'type': 'none', | 1139 'type': 'none', |
| 1140 'dependencies': [ | 1140 'dependencies': [ |
| 1141 'content.gyp:content_java', |
| 1141 'content_browsertests', | 1142 'content_browsertests', |
| 1142 'content_java', | |
| 1143 'content_java_test_support', | 1143 'content_java_test_support', |
| 1144 'content_shell_java', | 1144 'content_shell_java', |
| 1145 ], | 1145 ], |
| 1146 'variables': { | 1146 'variables': { |
| 1147 'apk_name': 'content_browsertests', | 1147 'apk_name': 'content_browsertests', |
| 1148 'java_in_dir': 'shell/android/browsertests_apk', | 1148 'java_in_dir': 'shell/android/browsertests_apk', |
| 1149 'resource_dir': 'shell/android/browsertests_apk/res', | 1149 'resource_dir': 'shell/android/browsertests_apk/res', |
| 1150 'native_lib_target': 'libcontent_browsertests', | 1150 'native_lib_target': 'libcontent_browsertests', |
| 1151 'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/cont
ent_shell.pak'], | 1151 'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/cont
ent_shell.pak'], |
| 1152 'asset_location': '<(ant_build_out)/content_shell/assets', | 1152 'asset_location': '<(ant_build_out)/content_shell/assets', |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1184 'jni_gen_package': 'content/public/test', | 1184 'jni_gen_package': 'content/public/test', |
| 1185 }, | 1185 }, |
| 1186 'includes': [ '../build/jni_generator.gypi' ], | 1186 'includes': [ '../build/jni_generator.gypi' ], |
| 1187 }, | 1187 }, |
| 1188 { | 1188 { |
| 1189 'target_name': 'content_java_test_support', | 1189 'target_name': 'content_java_test_support', |
| 1190 'type': 'none', | 1190 'type': 'none', |
| 1191 'dependencies': [ | 1191 'dependencies': [ |
| 1192 '../base/base.gyp:base', | 1192 '../base/base.gyp:base', |
| 1193 '../base/base.gyp:base_java_test_support', | 1193 '../base/base.gyp:base_java_test_support', |
| 1194 'content_common', | 1194 'content.gyp:content_common', |
| 1195 'content_java', | 1195 'content.gyp:content_java', |
| 1196 ], | 1196 ], |
| 1197 'variables': { | 1197 'variables': { |
| 1198 'java_in_dir': '../content/public/test/android/javatests', | 1198 'java_in_dir': '../content/public/test/android/javatests', |
| 1199 }, | 1199 }, |
| 1200 'includes': [ '../build/java.gypi' ], | 1200 'includes': [ '../build/java.gypi' ], |
| 1201 }, | 1201 }, |
| 1202 { | 1202 { |
| 1203 'target_name': 'content_shell_test_apk', | 1203 'target_name': 'content_shell_test_apk', |
| 1204 'type': 'none', | 1204 'type': 'none', |
| 1205 'dependencies': [ | 1205 'dependencies': [ |
| 1206 'content_java', | 1206 'content.gyp:content_java', |
| 1207 'content_java_test_support', | 1207 'content_java_test_support', |
| 1208 'content_shell_apk_java', | 1208 'content_shell_apk_java', |
| 1209 '../base/base.gyp:base_java', | 1209 '../base/base.gyp:base_java', |
| 1210 '../base/base.gyp:base_javatests', | 1210 '../base/base.gyp:base_javatests', |
| 1211 '../base/base.gyp:base_java_test_support', | 1211 '../base/base.gyp:base_java_test_support', |
| 1212 '../media/media.gyp:media_java', | 1212 '../media/media.gyp:media_java', |
| 1213 '../media/media.gyp:media_test_support', | 1213 '../media/media.gyp:media_test_support', |
| 1214 '../net/net.gyp:net_java', | 1214 '../net/net.gyp:net_java', |
| 1215 '../net/net.gyp:net_javatests', | 1215 '../net/net.gyp:net_javatests', |
| 1216 '../tools/android/forwarder2/forwarder.gyp:forwarder2', | 1216 '../tools/android/forwarder2/forwarder.gyp:forwarder2', |
| 1217 ], | 1217 ], |
| 1218 'variables': { | 1218 'variables': { |
| 1219 'apk_name': 'ContentShellTest', | 1219 'apk_name': 'ContentShellTest', |
| 1220 'java_in_dir': 'shell/android/javatests', | 1220 'java_in_dir': 'shell/android/javatests', |
| 1221 'resource_dir': 'shell/android/shell_apk/res', | 1221 'resource_dir': 'shell/android/shell_apk/res', |
| 1222 'additional_src_dirs': ['public/android/javatests/',], | 1222 'additional_src_dirs': ['public/android/javatests/',], |
| 1223 'is_test_apk': 1, | 1223 'is_test_apk': 1, |
| 1224 }, | 1224 }, |
| 1225 'includes': [ '../build/java_apk.gypi' ], | 1225 'includes': [ '../build/java_apk.gypi' ], |
| 1226 }, | 1226 }, |
| 1227 ], | 1227 ], |
| 1228 }], | 1228 }], |
| 1229 ], | 1229 ], |
| 1230 } | 1230 } |
| OLD | NEW |