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

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

Issue 655613002: Add pak files to the isolate. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: split three ways Created 6 years, 2 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
« no previous file with comments | « Source/web/WebKitUnitTests.isolate ('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 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 'cflags_cc': ['-Wno-c++0x-compat'], 132 'cflags_cc': ['-Wno-c++0x-compat'],
133 }, 133 },
134 }], 134 }],
135 ['OS=="android" and android_webview_build==0 and gtest_target_type == "s hared_library"', { 135 ['OS=="android" and android_webview_build==0 and gtest_target_type == "s hared_library"', {
136 # Wrap libwebkit_unit_tests.so into an android apk for execution. 136 # Wrap libwebkit_unit_tests.so into an android apk for execution.
137 'targets': [{ 137 'targets': [{
138 'target_name': 'webkit_unit_tests_apk', 138 'target_name': 'webkit_unit_tests_apk',
139 'type': 'none', 139 'type': 'none',
140 'dependencies': [ 140 'dependencies': [
141 '<(DEPTH)/base/base.gyp:base_java', 141 '<(DEPTH)/base/base.gyp:base_java',
142 '<(DEPTH)/content/content_shell_and_tests.gyp:content_shell_ pak',
Nate Chapin 2014/10/13 22:22:33 It's counter-intuitive that webkit_unit_tests requ
Avi (use Gerrit) 2014/10/13 22:27:37 Because you need content shell to run the tests. L
Nate Chapin 2014/10/13 22:29:12 Huh, ok.
142 '<(DEPTH)/net/net.gyp:net_java', 143 '<(DEPTH)/net/net.gyp:net_java',
143 'webkit_unit_tests', 144 'webkit_unit_tests',
144 ], 145 ],
145 'variables': { 146 'variables': {
146 'test_suite_name': 'webkit_unit_tests', 147 'test_suite_name': 'webkit_unit_tests',
147 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)w ebkit_unit_tests<(SHARED_LIB_SUFFIX)', 148 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)w ebkit_unit_tests<(SHARED_LIB_SUFFIX)',
148 'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/ass ets/content_shell.pak'], 149 'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/ass ets/content_shell.pak'],
149 'asset_location': '<(PRODUCT_DIR)/content_shell/assets', 150 'asset_location': '<(PRODUCT_DIR)/content_shell/assets',
150 }, 151 },
151 'includes': [ '../../../../build/apk_test.gypi' ], 152 'includes': [ '../../../../build/apk_test.gypi' ],
152 }], 153 }],
153 }], 154 }],
154 ], 155 ],
155 } 156 }
OLDNEW
« no previous file with comments | « Source/web/WebKitUnitTests.isolate ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698