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

Side by Side Diff: Source/web/web_tests.gyp

Issue 276573010: Adding Locale (language attribute) information to font and using the (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Comment fix Created 6 years, 7 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
« Source/web/web.gyp ('K') | « Source/web/web.gyp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # 1 #
2 # Copyright (C) 2011 Google Inc. All rights reserved. 2 # Copyright (C) 2011 Google Inc. All rights reserved.
3 # 3 #
4 # Redistribution and use in source and binary forms, with or without 4 # Redistribution and use in source and binary forms, with or without
5 # modification, are permitted provided that the following conditions are 5 # modification, are permitted provided that the following conditions are
6 # met: 6 # met:
7 # 7 #
8 # * Redistributions of source code must retain the above copyright 8 # * Redistributions of source code must retain the above copyright
9 # notice, this list of conditions and the following disclaimer. 9 # notice, this list of conditions and the following disclaimer.
10 # * Redistributions in binary form must reproduce the above 10 # * Redistributions in binary form must reproduce the above
(...skipping 30 matching lines...) Expand all
41 ], 41 ],
42 'targets': [ 42 'targets': [
43 { 43 {
44 'target_name': 'webkit_unit_tests_resources', 44 'target_name': 'webkit_unit_tests_resources',
45 'type': 'none', 45 'type': 'none',
46 'dependencies': [ 46 'dependencies': [
47 '<(DEPTH)/net/net.gyp:net_resources', 47 '<(DEPTH)/net/net.gyp:net_resources',
48 '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources', 48 '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources',
49 '<(DEPTH)/webkit/webkit_resources.gyp:webkit_resources', 49 '<(DEPTH)/webkit/webkit_resources.gyp:webkit_resources',
50 '<(DEPTH)/webkit/webkit_resources.gyp:webkit_strings', 50 '<(DEPTH)/webkit/webkit_resources.gyp:webkit_strings',
51 '<(DEPTH)/third_party/harfbuzz-ng/harfbuzz.gyp:harfbuzz-ng',
Inactive 2014/05/22 13:52:02 alphabetical order
51 ], 52 ],
52 'actions': [{ 53 'actions': [{
53 'action_name': 'repack_webkit_unit_tests_resources', 54 'action_name': 'repack_webkit_unit_tests_resources',
54 'variables': { 55 'variables': {
55 'repack_path': '<(DEPTH)/tools/grit/grit/format/repack.py', 56 'repack_path': '<(DEPTH)/tools/grit/grit/format/repack.py',
56 'pak_inputs': [ 57 'pak_inputs': [
57 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak', 58 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
58 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources _100_percent.pak', 59 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources _100_percent.pak',
59 '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.pak', 60 '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.pak',
60 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US. pak', 61 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US. pak',
(...skipping 29 matching lines...) Expand all
90 '<(DEPTH)/base/base.gyp:base', 91 '<(DEPTH)/base/base.gyp:base',
91 '<(DEPTH)/base/base.gyp:base_i18n', 92 '<(DEPTH)/base/base.gyp:base_i18n',
92 '<(DEPTH)/base/base.gyp:test_support_base', 93 '<(DEPTH)/base/base.gyp:test_support_base',
93 '<(DEPTH)/testing/gmock.gyp:gmock', 94 '<(DEPTH)/testing/gmock.gyp:gmock',
94 '<(DEPTH)/testing/gtest.gyp:gtest', 95 '<(DEPTH)/testing/gtest.gyp:gtest',
95 '<(DEPTH)/third_party/libwebp/libwebp.gyp:libwebp', 96 '<(DEPTH)/third_party/libwebp/libwebp.gyp:libwebp',
96 '<(DEPTH)/third_party/zlib/zlib.gyp:zlib', 97 '<(DEPTH)/third_party/zlib/zlib.gyp:zlib',
97 '<(DEPTH)/url/url.gyp:url_lib', 98 '<(DEPTH)/url/url.gyp:url_lib',
98 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', 99 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
99 '<(DEPTH)/content/content_shell_and_tests.gyp:content_webkit_uni t_test_support', 100 '<(DEPTH)/content/content_shell_and_tests.gyp:content_webkit_uni t_test_support',
101 '<(DEPTH)/third_party/harfbuzz-ng/harfbuzz.gyp:harfbuzz-ng',
Inactive 2014/05/22 13:52:02 ditto
100 'webkit_unit_tests_resources', 102 'webkit_unit_tests_resources',
101 ], 103 ],
102 'sources': [ 104 'sources': [
103 '../web/tests/RunAllTests.cpp', 105 '../web/tests/RunAllTests.cpp',
104 ], 106 ],
105 'include_dirs': [ 107 'include_dirs': [
106 '../../public/web', 108 '../../public/web',
107 '../web', 109 '../web',
108 'src', 110 'src',
109 ], 111 ],
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 }, 177 },
176 }], 178 }],
177 ['OS=="android" and android_webview_build==0 and gtest_target_type == "s hared_library"', { 179 ['OS=="android" and android_webview_build==0 and gtest_target_type == "s hared_library"', {
178 # Wrap libwebkit_unit_tests.so into an android apk for execution. 180 # Wrap libwebkit_unit_tests.so into an android apk for execution.
179 'targets': [{ 181 'targets': [{
180 'target_name': 'webkit_unit_tests_apk', 182 'target_name': 'webkit_unit_tests_apk',
181 'type': 'none', 183 'type': 'none',
182 'dependencies': [ 184 'dependencies': [
183 '<(DEPTH)/base/base.gyp:base_java', 185 '<(DEPTH)/base/base.gyp:base_java',
184 '<(DEPTH)/net/net.gyp:net_java', 186 '<(DEPTH)/net/net.gyp:net_java',
187 '<(DEPTH)/third_party/harfbuzz-ng/harfbuzz.gyp:harfbuzz-ng',
185 'webkit_unit_tests', 188 'webkit_unit_tests',
186 ], 189 ],
187 'variables': { 190 'variables': {
188 'test_suite_name': 'webkit_unit_tests', 191 'test_suite_name': 'webkit_unit_tests',
189 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)w ebkit_unit_tests<(SHARED_LIB_SUFFIX)', 192 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)w ebkit_unit_tests<(SHARED_LIB_SUFFIX)',
190 }, 193 },
191 'includes': [ '../../../../build/apk_test.gypi' ], 194 'includes': [ '../../../../build/apk_test.gypi' ],
192 }], 195 }],
193 }], 196 }],
194 ], 197 ],
195 } 198 }
OLDNEW
« Source/web/web.gyp ('K') | « Source/web/web.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698