Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(132)

Side by Side Diff: trunk/src/content/content_tests.gypi

Issue 18547009: Revert 209420 "Factor out content shell and tests into a standal..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « trunk/src/content/content_shell_and_tests.gyp ('k') | trunk/src/ui/views/views.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Added: svn:mergeinfo
OLDNEW
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.gyp:content_app', 19 'content_app',
20 'content.gyp:content_browser', 20 'content_browser',
21 'content.gyp:content_common', 21 '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
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.gyp:content_child', 164 'content_child',
165 'content.gyp:content_ppapi_plugin', 165 'content_ppapi_plugin',
166 'content.gyp:content_utility', 166 'content_utility',
167 'content.gyp:content_worker', 167 '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
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.gyp:content_browser', 248 'content_browser',
249 'content.gyp:content_common', 249 '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 294 matching lines...) Expand 10 before | Expand all | Expand 10 after
554 # iOS only needs a small portion of content; exclude all the 554 # iOS only needs a small portion of content; exclude all the
555 # implementation, and re-include what is used. 555 # implementation, and re-include what is used.
556 ['exclude', '\\.(cc|mm)$'], 556 ['exclude', '\\.(cc|mm)$'],
557 ['include', '_ios\\.(cc|mm)$'], 557 ['include', '_ios\\.(cc|mm)$'],
558 ['include', '^browser/notification_service_impl_unittest\\.cc$'], 558 ['include', '^browser/notification_service_impl_unittest\\.cc$'],
559 ['include', '^browser/web_contents/navigation_entry_impl_unittest\\. cc$'], 559 ['include', '^browser/web_contents/navigation_entry_impl_unittest\\. cc$'],
560 ['include', '^test/run_all_unittests\\.cc$'], 560 ['include', '^test/run_all_unittests\\.cc$'],
561 ], 561 ],
562 }, { # OS != "ios" 562 }, { # OS != "ios"
563 'dependencies': [ 563 'dependencies': [
564 'content.gyp:content_browser', 564 'content_browser',
565 'content.gyp:content_child', 565 'content_child',
566 'content.gyp:content_gpu', 566 'content_gpu',
567 'content.gyp:content_plugin', 567 'content_plugin',
568 'content.gyp:content_renderer', 568 'content_renderer',
569 'content_resources.gyp:content_resources', 569 'content_resources.gyp:content_resources',
570 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn amic_annotations', 570 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn amic_annotations',
571 '../gpu/gpu.gyp:gpu', 571 '../gpu/gpu.gyp:gpu',
572 '../gpu/gpu.gyp:gpu_unittest_utils', 572 '../gpu/gpu.gyp:gpu_unittest_utils',
573 '../ipc/ipc.gyp:test_support_ipc', 573 '../ipc/ipc.gyp:test_support_ipc',
574 '../jingle/jingle.gyp:jingle_glue_test_util', 574 '../jingle/jingle.gyp:jingle_glue_test_util',
575 '../media/media.gyp:shared_memory_support', 575 '../media/media.gyp:shared_memory_support',
576 '../third_party/WebKit/public/blink.gyp:blink', 576 '../third_party/WebKit/public/blink.gyp:blink',
577 '../third_party/icu/icu.gyp:icui18n', 577 '../third_party/icu/icu.gyp:icui18n',
578 '../third_party/icu/icu.gyp:icuuc', 578 '../third_party/icu/icu.gyp:icuuc',
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
729 }, 729 },
730 ], 730 ],
731 'conditions': [ 731 'conditions': [
732 ['OS!="ios"', { 732 ['OS!="ios"', {
733 'targets': [ 733 'targets': [
734 { 734 {
735 'target_name': 'content_browsertests', 735 'target_name': 'content_browsertests',
736 'type': '<(gtest_target_type)', 736 'type': '<(gtest_target_type)',
737 'defines!': ['CONTENT_IMPLEMENTATION'], 737 'defines!': ['CONTENT_IMPLEMENTATION'],
738 'dependencies': [ 738 'dependencies': [
739 'content.gyp:content_common', 739 'content_common',
740 'content.gyp:content_gpu', 740 'content_gpu',
741 'content.gyp:content_plugin', 741 'content_plugin',
742 'content.gyp:content_renderer', 742 'content_renderer',
743 'content_shell_lib', 743 'content_shell_lib',
744 'content_shell_pak', 744 'content_shell_pak',
745 'test_support_content', 745 'test_support_content',
746 '../base/base.gyp:test_support_base', 746 '../base/base.gyp:test_support_base',
747 '../gpu/gpu.gyp:gpu', 747 '../gpu/gpu.gyp:gpu',
748 '../ipc/ipc.gyp:test_support_ipc', 748 '../ipc/ipc.gyp:test_support_ipc',
749 '../net/net.gyp:net_test_support', 749 '../net/net.gyp:net_test_support',
750 '../ppapi/ppapi_internal.gyp:ppapi_host', 750 '../ppapi/ppapi_internal.gyp:ppapi_host',
751 '../ppapi/ppapi_internal.gyp:ppapi_ipc', 751 '../ppapi/ppapi_internal.gyp:ppapi_ipc',
752 '../ppapi/ppapi_internal.gyp:ppapi_proxy', 752 '../ppapi/ppapi_internal.gyp:ppapi_proxy',
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
980 ['exclude', '^browser/speech/'], 980 ['exclude', '^browser/speech/'],
981 ] 981 ]
982 }], 982 }],
983 ], 983 ],
984 }, 984 },
985 { 985 {
986 'target_name': 'content_gl_tests', 986 'target_name': 'content_gl_tests',
987 'type': '<(gtest_target_type)', 987 'type': '<(gtest_target_type)',
988 'defines!': ['CONTENT_IMPLEMENTATION'], 988 'defines!': ['CONTENT_IMPLEMENTATION'],
989 'dependencies': [ 989 'dependencies': [
990 'content.gyp:content_common', 990 'content_common',
991 'test_support_content', 991 'test_support_content',
992 '../base/base.gyp:test_support_base', 992 '../base/base.gyp:test_support_base',
993 '../testing/gtest.gyp:gtest', 993 '../testing/gtest.gyp:gtest',
994 '../ui/ui.gyp:ui', 994 '../ui/ui.gyp:ui',
995 '../ui/gl/gl.gyp:gl', 995 '../ui/gl/gl.gyp:gl',
996 '../third_party/WebKit/public/blink.gyp:blink', 996 '../third_party/WebKit/public/blink.gyp:blink',
997 ], 997 ],
998 'include_dirs': [ 998 'include_dirs': [
999 '..', 999 '..',
1000 ], 1000 ],
1001 'sources': [ 1001 'sources': [
1002 'common/gpu/client/gl_helper_unittests.cc', 1002 'common/gpu/client/gl_helper_unittests.cc',
1003 'common/gpu/client/gpu_in_process_context_tests.cc', 1003 'common/gpu/client/gpu_in_process_context_tests.cc',
1004 ], 1004 ],
1005 }, 1005 },
1006 { 1006 {
1007 'target_name': 'content_gl_benchmark', 1007 'target_name': 'content_gl_benchmark',
1008 'type': '<(gtest_target_type)', 1008 'type': '<(gtest_target_type)',
1009 'defines!': ['CONTENT_IMPLEMENTATION'], 1009 'defines!': ['CONTENT_IMPLEMENTATION'],
1010 'dependencies': [ 1010 'dependencies': [
1011 'content.gyp:content_common', 1011 'content_common',
1012 'test_support_content', 1012 'test_support_content',
1013 '../base/base.gyp:test_support_base', 1013 '../base/base.gyp:test_support_base',
1014 '../testing/gtest.gyp:gtest', 1014 '../testing/gtest.gyp:gtest',
1015 '../ui/ui.gyp:ui', 1015 '../ui/ui.gyp:ui',
1016 '../ui/gl/gl.gyp:gl', 1016 '../ui/gl/gl.gyp:gl',
1017 '../third_party/WebKit/public/blink.gyp:blink', 1017 '../third_party/WebKit/public/blink.gyp:blink',
1018 ], 1018 ],
1019 'include_dirs': [ 1019 'include_dirs': [
1020 '..', 1020 '..',
1021 ], 1021 ],
1022 'sources': [ 1022 'sources': [
1023 'common/gpu/client/gl_helper_benchmark.cc', 1023 'common/gpu/client/gl_helper_benchmark.cc',
1024 ], 1024 ],
1025 }, 1025 },
1026 ], 1026 ],
1027 }], 1027 }],
1028 ['chromeos==1 or OS=="win" or OS=="android"', { 1028 ['chromeos==1 or OS=="win" or OS=="android"', {
1029 'targets': [ 1029 'targets': [
1030 { 1030 {
1031 'target_name': 'video_decode_accelerator_unittest', 1031 'target_name': 'video_decode_accelerator_unittest',
1032 'type': '<(gtest_target_type)', 1032 'type': '<(gtest_target_type)',
1033 'dependencies': [ 1033 'dependencies': [
1034 'content.gyp:content', 1034 'content',
1035 '../base/base.gyp:base', 1035 '../base/base.gyp:base',
1036 '../testing/gtest.gyp:gtest', 1036 '../testing/gtest.gyp:gtest',
1037 '../media/media.gyp:media', 1037 '../media/media.gyp:media',
1038 '../ui/gl/gl.gyp:gl', 1038 '../ui/gl/gl.gyp:gl',
1039 '../ui/ui.gyp:ui', 1039 '../ui/ui.gyp:ui',
1040 ], 1040 ],
1041 'include_dirs': [ 1041 'include_dirs': [
1042 '<(DEPTH)/third_party/khronos', 1042 '<(DEPTH)/third_party/khronos',
1043 ], 1043 ],
1044 'sources': [ 1044 'sources': [
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
1093 'msvs_disabled_warnings': [ 4267, ], 1093 'msvs_disabled_warnings': [ 4267, ],
1094 }, 1094 },
1095 ] 1095 ]
1096 }], 1096 }],
1097 ['chromeos == 1 or OS == "linux"', { 1097 ['chromeos == 1 or OS == "linux"', {
1098 'targets': [ 1098 'targets': [
1099 { 1099 {
1100 'target_name': 'h264_parser_unittest', 1100 'target_name': 'h264_parser_unittest',
1101 'type': 'executable', 1101 'type': 'executable',
1102 'dependencies': [ 1102 'dependencies': [
1103 'content.gyp:content_common', 1103 'content_common',
1104 '../base/base.gyp:base', 1104 '../base/base.gyp:base',
1105 '../testing/gtest.gyp:gtest', 1105 '../testing/gtest.gyp:gtest',
1106 ], 1106 ],
1107 'sources': [ 1107 'sources': [
1108 'common/gpu/media/h264_bit_reader_unittest.cc', 1108 'common/gpu/media/h264_bit_reader_unittest.cc',
1109 'common/gpu/media/h264_parser_unittest.cc', 1109 'common/gpu/media/h264_parser_unittest.cc',
1110 ], 1110 ],
1111 'conditions': [ 1111 'conditions': [
1112 ['linux_use_tcmalloc==1', { 1112 ['linux_use_tcmalloc==1', {
1113 'dependencies': [ 1113 'dependencies': [
1114 '../base/allocator/allocator.gyp:allocator', 1114 '../base/allocator/allocator.gyp:allocator',
1115 ], 1115 ],
1116 }], 1116 }],
1117 ], 1117 ],
1118 } 1118 }
1119 ], 1119 ],
1120 }], 1120 }],
1121 # Special target to wrap a gtest_target_type==shared_library 1121 # Special target to wrap a gtest_target_type==shared_library
1122 # content_unittests into an android apk for execution. 1122 # content_unittests into an android apk for execution.
1123 # See base.gyp for TODO(jrg)s about this strategy. 1123 # See base.gyp for TODO(jrg)s about this strategy.
1124 ['OS == "android" and gtest_target_type == "shared_library"', { 1124 ['OS == "android" and gtest_target_type == "shared_library"', {
1125 'targets': [ 1125 'targets': [
1126 { 1126 {
1127 'target_name': 'content_unittests_apk', 1127 'target_name': 'content_unittests_apk',
1128 'type': 'none', 1128 'type': 'none',
1129 'dependencies': [ 1129 'dependencies': [
1130 'content.gyp:content_java', 1130 'content_java',
1131 'content_unittests', 1131 'content_unittests',
1132 ], 1132 ],
1133 'variables': { 1133 'variables': {
1134 'test_suite_name': 'content_unittests', 1134 'test_suite_name': 'content_unittests',
1135 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)content_u nittests<(SHARED_LIB_SUFFIX)', 1135 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)content_u nittests<(SHARED_LIB_SUFFIX)',
1136 }, 1136 },
1137 'includes': [ '../build/apk_test.gypi' ], 1137 'includes': [ '../build/apk_test.gypi' ],
1138 }, 1138 },
1139 { 1139 {
1140 'target_name': 'content_browsertests_apk', 1140 'target_name': 'content_browsertests_apk',
1141 'type': 'none', 1141 'type': 'none',
1142 'dependencies': [ 1142 'dependencies': [
1143 'content.gyp:content_java',
1144 'content_browsertests', 1143 'content_browsertests',
1144 'content_java',
1145 'content_java_test_support', 1145 'content_java_test_support',
1146 'content_shell_java', 1146 'content_shell_java',
1147 ], 1147 ],
1148 'variables': { 1148 'variables': {
1149 'apk_name': 'content_browsertests', 1149 'apk_name': 'content_browsertests',
1150 'java_in_dir': 'shell/android/browsertests_apk', 1150 'java_in_dir': 'shell/android/browsertests_apk',
1151 'resource_dir': 'shell/android/browsertests_apk/res', 1151 'resource_dir': 'shell/android/browsertests_apk/res',
1152 'native_lib_target': 'libcontent_browsertests', 1152 'native_lib_target': 'libcontent_browsertests',
1153 'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/cont ent_shell.pak'], 1153 'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/cont ent_shell.pak'],
1154 'asset_location': '<(ant_build_out)/content_shell/assets', 1154 'asset_location': '<(ant_build_out)/content_shell/assets',
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
1186 'jni_gen_package': 'content/public/test', 1186 'jni_gen_package': 'content/public/test',
1187 }, 1187 },
1188 'includes': [ '../build/jni_generator.gypi' ], 1188 'includes': [ '../build/jni_generator.gypi' ],
1189 }, 1189 },
1190 { 1190 {
1191 'target_name': 'content_java_test_support', 1191 'target_name': 'content_java_test_support',
1192 'type': 'none', 1192 'type': 'none',
1193 'dependencies': [ 1193 'dependencies': [
1194 '../base/base.gyp:base', 1194 '../base/base.gyp:base',
1195 '../base/base.gyp:base_java_test_support', 1195 '../base/base.gyp:base_java_test_support',
1196 'content.gyp:content_common', 1196 'content_common',
1197 'content.gyp:content_java', 1197 'content_java',
1198 ], 1198 ],
1199 'variables': { 1199 'variables': {
1200 'java_in_dir': '../content/public/test/android/javatests', 1200 'java_in_dir': '../content/public/test/android/javatests',
1201 }, 1201 },
1202 'includes': [ '../build/java.gypi' ], 1202 'includes': [ '../build/java.gypi' ],
1203 }, 1203 },
1204 { 1204 {
1205 'target_name': 'content_shell_test_apk', 1205 'target_name': 'content_shell_test_apk',
1206 'type': 'none', 1206 'type': 'none',
1207 'dependencies': [ 1207 'dependencies': [
1208 'content.gyp:content_java', 1208 'content_java',
1209 'content_java_test_support', 1209 'content_java_test_support',
1210 'content_shell_apk_java', 1210 'content_shell_apk_java',
1211 '../base/base.gyp:base_java', 1211 '../base/base.gyp:base_java',
1212 '../base/base.gyp:base_javatests', 1212 '../base/base.gyp:base_javatests',
1213 '../base/base.gyp:base_java_test_support', 1213 '../base/base.gyp:base_java_test_support',
1214 '../media/media.gyp:media_java', 1214 '../media/media.gyp:media_java',
1215 '../media/media.gyp:media_test_support', 1215 '../media/media.gyp:media_test_support',
1216 '../net/net.gyp:net_java', 1216 '../net/net.gyp:net_java',
1217 '../net/net.gyp:net_javatests', 1217 '../net/net.gyp:net_javatests',
1218 '../tools/android/forwarder2/forwarder.gyp:forwarder2', 1218 '../tools/android/forwarder2/forwarder.gyp:forwarder2',
1219 ], 1219 ],
1220 'variables': { 1220 'variables': {
1221 'apk_name': 'ContentShellTest', 1221 'apk_name': 'ContentShellTest',
1222 'java_in_dir': 'shell/android/javatests', 1222 'java_in_dir': 'shell/android/javatests',
1223 'resource_dir': 'shell/android/shell_apk/res', 1223 'resource_dir': 'shell/android/shell_apk/res',
1224 'additional_src_dirs': ['public/android/javatests/',], 1224 'additional_src_dirs': ['public/android/javatests/',],
1225 'is_test_apk': 1, 1225 'is_test_apk': 1,
1226 }, 1226 },
1227 'includes': [ '../build/java_apk.gypi' ], 1227 'includes': [ '../build/java_apk.gypi' ],
1228 }, 1228 },
1229 ], 1229 ],
1230 }], 1230 }],
1231 ], 1231 ],
1232 } 1232 }
OLDNEW
« no previous file with comments | « trunk/src/content/content_shell_and_tests.gyp ('k') | trunk/src/ui/views/views.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698